@@ -556,9 +556,6 @@ protected void observe() {
556556 resolver .registerContentObserver (Settings .System .getUriFor (
557557 Settings .System .BATTERY_SAVER_MODE_COLOR ),
558558 false , this , UserHandle .USER_ALL );
559- resolver .registerContentObserver (Settings .System .getUriFor (
560- Settings .System .STATUS_BAR_CUSTOM_HEADER_DEFAULT ),
561- false , this , UserHandle .USER_ALL );
562559 resolver .registerContentObserver (Settings .System .getUriFor (
563560 Settings .System .STATUS_BAR_SHOW_WEATHER_TEMP ),
564561 false , this , UserHandle .USER_ALL );
@@ -617,28 +614,10 @@ public void onChange(boolean selfChange, Uri uri) {
617614 .getColor (com .android .internal .R .color .battery_saver_mode_color );
618615 }
619616 } else if (uri .equals (Settings .System .getUriFor (
620- Settings .System .STATUS_BAR_CUSTOM_HEADER_DEFAULT ))) {
621- recreateStatusBar ();
622- updateRowStates ();
623- updateSpeedbump ();
624- updateClearAll ();
625- updateEmptyShadeView ();
626- } else if (uri .equals (Settings .System .getUriFor (
627617 Settings .System .USE_SLIM_RECENTS ))) {
628618 updateRecents ();
629619 } else if (uri .equals (Settings .System .getUriFor (
630- Settings .System .RECENT_CARD_BG_COLOR ))
631- || uri .equals (Settings .System .getUriFor (
632- Settings .System .RECENT_CARD_TEXT_COLOR ))) {
633- rebuildRecentsScreen ();
634- } else if (uri .equals (Settings .System .getUriFor (
635- Settings .System .STATUS_BAR_WEATHER_TEMP_STYLE ))
636- || uri .equals (Settings .System .getUriFor (
637- Settings .System .STATUS_BAR_WEATHER_COLOR ))
638- || uri .equals (Settings .System .getUriFor (
639- Settings .System .STATUS_BAR_WEATHER_SIZE ))
640- || uri .equals (Settings .System .getUriFor (
641- Settings .System .STATUS_BAR_WEATHER_FONT_STYLE ))) {
620+ Settings .System .STATUS_BAR_WEATHER_TEMP_STYLE ))) {
642621 recreateStatusBar ();
643622 updateRowStates ();
644623 updateSpeedbump ();
@@ -740,14 +719,16 @@ public void update() {
740719 mWeatherTempFontStyle = Settings .System .getIntForUser (resolver ,
741720 Settings .System .STATUS_BAR_WEATHER_FONT_STYLE , FONT_NORMAL , mCurrentUserId );
742721
743- final int oldWeatherState = mWeatherTempState ;
722+ if (mWeatherTempStyle == 0 ) {
723+ mWeatherTempView = (TextView ) mStatusBarView .findViewById (R .id .weather_temp );
724+ } else {
725+ mWeatherTempView = (TextView ) mStatusBarView .findViewById (R .id .left_weather_temp );
726+ }
744727 mWeatherTempState = Settings .System .getIntForUser (
745728 resolver , Settings .System .STATUS_BAR_SHOW_WEATHER_TEMP , 0 ,
746729 UserHandle .USER_CURRENT );
747- if (oldWeatherState != mWeatherTempState ) {
748- updateWeatherTextState (mWeatherController .getWeatherInfo ().temp ,
749- mWeatherTempColor , mWeatherTempSize , mWeatherTempFontStyle );
750- }
730+ updateWeatherTextState (mWeatherController .getWeatherInfo ().temp ,
731+ mWeatherTempColor , mWeatherTempSize , mWeatherTempFontStyle );
751732
752733 mBlurRadius = Settings .System .getInt (mContext .getContentResolver (),
753734 Settings .System .LOCKSCREEN_BLUR_RADIUS , 14 );
0 commit comments