From 626433223fddd8e736628bfba76ed7e0131530b6 Mon Sep 17 00:00:00 2001 From: Brian Jones Date: Wed, 13 Aug 2014 15:44:08 -0700 Subject: [PATCH] Fix font name, temporarily remove subscribe call, and fix app name Change-Id: Idd9b711c230f814dc9c0b016658177646d19a48b --- css/car/car.css | 15 +++++++-------- js/services/carIndicator.js | 3 ++- js/services/speech.js | 2 +- packaging/modello-common.changes | 3 +++ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/css/car/car.css b/css/car/car.css index a8f94a4..fd608fe 100644 --- a/css/car/car.css +++ b/css/car/car.css @@ -3,19 +3,18 @@ /* This is theme aimed for Intel Coulomb 2012 */ @font-face { font-family: HelveticaNeue; - - src: url('./fonts/HelveticaNeue-Regular.eot?#iefix') format('embedded-opentype'), + src: url('./fonts/HelveticaNeue-Regular.ttf') format('truetype'), + url('./fonts/HelveticaNeue-Regular.eot?#iefix') format('embedded-opentype'), url('./fonts/HelveticaNeue-Regular.woff') format('woff'), - url('./fonts/HelveticaNeue-Regular.ttf') format('truetype'), url('./fonts/HelveticaNeue-Regular.svg#svgFontName') format('svg'), local("HelveticaNeue"); } @font-face { font-family: HelveticaNeue; - src: url('./fonts/HelveticaNeue-CondensedBold.eot?#iefix') format('embedded-opentype'), + src: url('./fonts/HelveticaNeue-CondensedBold.ttf') format('truetype'), + url('./fonts/HelveticaNeue-CondensedBold.eot?#iefix') format('embedded-opentype'), url('./fonts/HelveticaNeue-CondensedBold.woff') format('woff'), - url('./fonts/HelveticaNeue-CondensedBold.ttf') format('truetype'), url('./fonts/HelveticaNeue-CondensedBold.svg#svgFontName') format('svg'), local("HelveticaNeue"); @@ -24,9 +23,9 @@ @font-face { font-family: HelveticaNeue; - src: url('./fonts/HelveticaNeue-Light.eot?#iefix') format('embedded-opentype'), + src: url('./fonts/HelveticaNeue-Light.ttf') format('truetype'), + url('./fonts/HelveticaNeue-Light.eot?#iefix') format('embedded-opentype'), url('./fonts/HelveticaNeue-Light.woff') format('woff'), - url('./fonts/HelveticaNeue-Light.ttf') format('truetype'), url('./fonts/HelveticaNeue-Light.svg#svgFontName') format('svg'), local("HelveticaNeue"); @@ -254,4 +253,4 @@ input { .inputBox .nextButton:active { top: 1px; right: 1px; -} \ No newline at end of file +} diff --git a/js/services/carIndicator.js b/js/services/carIndicator.js index c30504a..896aac9 100644 --- a/js/services/carIndicator.js +++ b/js/services/carIndicator.js @@ -474,7 +474,8 @@ CarIndicator.prototype.addListener = function(aCallbackObject) { self.onDataUpdate(setUpData, self, id); } } - tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone); + //subscribe isn't supported yet, will re-enable once it is + //tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone); } else { console.warn("Tizen API is not available, cannot subscribe to signal", signal); } diff --git a/js/services/speech.js b/js/services/speech.js index 0787c30..9d2a21c 100644 --- a/js/services/speech.js +++ b/js/services/speech.js @@ -210,7 +210,7 @@ var Speech = (function() { Speech.prototype.readCurrentAppName = function() { if (typeof (tizen) !== 'undefined') { var appName = tizen.application.getCurrentApplication().appInfo.name.toString().trim().toLowerCase(); - if (appName === "hvac") { + if (appName === "modello hvac") { appName = "air conditioning"; } this.vocalizeString(appName); diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes index c678c66..ef64dd7 100644 --- a/packaging/modello-common.changes +++ b/packaging/modello-common.changes @@ -1,3 +1,6 @@ +* Wed Aug 13 2014 Brian Jones submit/tizen_3.0.m14.2_ivi/20140723.000002-4-g94fa069 +- Fix font name, temporarily remove subscribe call, and fix app name + * Mon Aug 11 2014 Jimmy Huang submit/tizen_3.0.m14.2_ivi/20140723.000002-3-g042024f - Fix Modello to use tizen.bluetooth instead of tizen.bt -- 2.7.4