SystemUI: Improvise weather on lockscreen code [1/2]

* current_weather_view -> extra_weather_view
* Single toggle for extar weather info
* A bit of code changes

Signed-off-by: Jayant-Deshmukh <jayantdeshmuk008@gmail.com>

Author: Jayant-Deshmukh

core/java/android/provider/Settings.java

@@ -6483,12 +6483,7 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
         /**
          * @hide
          */
-        public static final String LOCKSCREEN_WEATHER_WIND_INFO = "lockscreen_weather_wind_info";
-
-        /**
-         * @hide
-         */
-        public static final String LOCKSCREEN_WEATHER_HUMIDITY_INFO = "lockscreen_weather_humidity_info";
+        public static final String LOCKSCREEN_WEATHER_EXTRA_INFO = "lockscreen_weather_extra_info";
 
         /**
          * Whether to play notification sound and vibration if screen is ON

…keyguard/layout/current_weather_view.xml …s-keyguard/layout/extra_weather_view.xmlpackages/SystemUI/res-keyguard/layout/current_weather_view.xml renamed to packages/SystemUI/res-keyguard/layout/extra_weather_view.xml packages/SystemUI/res-keyguard/layout/current_weather_view.xml renamed to packages/SystemUI/res-keyguard/layout/extra_weather_view.xml

@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.systemui.superior.CurrentWeatherView
+<com.android.systemui.superior.ExtraWeatherView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -140,4 +140,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</com.android.systemui.superior.CurrentWeatherView>
+</com.android.systemui.superior.ExtraWeatherView>

packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml

@@ -56,8 +56,8 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content" />
 
-        <include layout="@layout/current_weather_view"
-            android:id="@+id/weather_container"
+        <include layout="@layout/extra_weather_view"
+            android:id="@+id/extra_weather_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone" />

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

@@ -37,7 +37,7 @@
 
 import com.android.systemui.Dependency;
 import com.android.systemui.Dumpable;
-import com.android.systemui.superior.CurrentWeatherView;
+import com.android.systemui.superior.ExtraWeatherView;
 import com.android.systemui.dagger.qualifiers.Background;
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dump.DumpManager;
@@ -115,7 +115,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
     private final KeyguardUnlockAnimationController mKeyguardUnlockAnimationController;
     private final InWindowLauncherUnlockAnimationManager mInWindowLauncherUnlockAnimationManager;
 
-    private CurrentWeatherView mCurrentWeatherView;
+    private ExtraWeatherView mExtraWeatherView;
     private boolean mShowWeather;
 
     private boolean mShownOnSecondaryDisplay = false;
@@ -243,7 +243,7 @@ protected void onInit() {
             mLargeClockFrame = mView
                 .findViewById(com.android.systemui.customization.R.id.lockscreen_clock_view_large);
         }
-        mCurrentWeatherView = mView.findViewById(R.id.weather_container);
+        mExtraWeatherView = mView.findViewById(R.id.extra_weather_container);
 
         if (!mOnlyClock) {
             mDumpManager.unregisterDumpable(getClass().getSimpleName()); // unregister previous
@@ -388,13 +388,13 @@ public void onTuningChanged(String key, String newValue) {
 
     public void updateWeatherView() {
         mUiExecutor.execute(() -> {
-            if (mCurrentWeatherView != null) {
+            if (mExtraWeatherView != null) {
                 if (mShowWeather && !mOnlyClock) {
-                    mCurrentWeatherView.enableUpdates();
-                    mCurrentWeatherView.setVisibility(View.VISIBLE);
+                    mExtraWeatherView.enableUpdates();
+                    mExtraWeatherView.setVisibility(View.VISIBLE);
                 } else {
-                    mCurrentWeatherView.disableUpdates();
-                    mCurrentWeatherView.setVisibility(View.GONE);
+                    mExtraWeatherView.disableUpdates();
+                    mExtraWeatherView.setVisibility(View.GONE);
                 }
             }
         });

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

@@ -187,7 +187,7 @@ object KeyguardRootViewBinder {
                                 childViews[statusViewId]?.alpha = alpha
                                 childViews[burnInLayerId]?.alpha = alpha
                                 childViews[sliceViewId]?.alpha = alpha
-                                childViews[weatherContainerId]?.alpha = alpha
+                                childViews[extraWeatherContainerId]?.alpha = alpha
                             }
                         }
                     }
@@ -201,7 +201,7 @@ object KeyguardRootViewBinder {
                             viewModel.translationY.collect { y ->
                                 childViews[burnInLayerId]?.translationY = y
                                 childViews[sliceViewId]?.translationY = y
-                                childViews[weatherContainerId]?.translationY = y
+                                childViews[extraWeatherContainerId]?.translationY = y
                                 childViews[largeClockId]?.translationY = y
                                 childViews[aodNotificationIconContainerId]?.translationY = y
                             }
@@ -215,7 +215,7 @@ object KeyguardRootViewBinder {
                                         // Large Clock is not translated in the x direction
                                         childViews[burnInLayerId]?.translationX = px
                                         childViews[sliceViewId]?.translationX = px
-                                        childViews[weatherContainerId]?.translationX = px
+                                        childViews[extraWeatherContainerId]?.translationX = px
                                         childViews[aodNotificationIconContainerId]?.translationX =
                                             px
                                     }
@@ -274,7 +274,7 @@ object KeyguardRootViewBinder {
                             viewModel.burnInLayerVisibility.collect { visibility ->
                                 childViews[burnInLayerId]?.visibility = visibility
                                 childViews[sliceViewId]?.visibility = visibility
-                                childViews[weatherContainerId]?.visibility = visibility
+                                childViews[extraWeatherContainerId]?.visibility = visibility
                             }
                         }
 
@@ -625,7 +625,7 @@ object KeyguardRootViewBinder {
     private val statusViewId = R.id.keyguard_status_view
     private val burnInLayerId = R.id.burn_in_layer
     private val sliceViewId = R.id.keyguard_slice_view
-    private val weatherContainerId = R.id.weather_container
+    private val extraWeatherContainerId = R.id.extra_weather_container
     private val aodNotificationIconContainerId = R.id.aod_notification_icon_container
     private val largeClockId = customR.id.lockscreen_clock_view_large
     private val smallClockId = customR.id.lockscreen_clock_view

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/DefaultKeyguardBlueprint.kt

@@ -36,7 +36,7 @@ import com.android.systemui.keyguard.ui.view.layout.sections.DefaultUdfpsAccessi
 import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule.Companion.KEYGUARD_AMBIENT_INDICATION_AREA_SECTION
 import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSliceViewSection
 import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection
-import com.android.systemui.keyguard.ui.view.layout.sections.WeatherViewSection
+import com.android.systemui.keyguard.ui.view.layout.sections.ExtraWeatherViewSection
 import java.util.Optional
 import javax.inject.Inject
 import javax.inject.Named
@@ -71,7 +71,7 @@ constructor(
     smartspaceSection: SmartspaceSection,
     keyguardSliceViewSection: KeyguardSliceViewSection,
     udfpsAccessibilityOverlaySection: DefaultUdfpsAccessibilityOverlaySection,
-    weatherViewSection: WeatherViewSection,
+    extraWeatherViewSection: ExtraWeatherViewSection,
 ) : KeyguardBlueprint {
     override val id: String = DEFAULT
 
@@ -91,7 +91,7 @@ constructor(
             communalTutorialIndicatorSection,
             clockSection,
             keyguardSliceViewSection,
-            weatherViewSection,
+            extraWeatherViewSection,
             defaultDeviceEntrySection,
             udfpsAccessibilityOverlaySection, // Add LAST: Intentionally has z-order above others
         )

…ew/layout/sections/WeatherViewSection.kt …yout/sections/ExtraWeatherViewSection.ktpackages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/WeatherViewSection.kt renamed to packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ExtraWeatherViewSection.kt packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/WeatherViewSection.kt renamed to packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ExtraWeatherViewSection.kt

@@ -28,7 +28,7 @@ import com.android.systemui.res.R
 import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController
 import javax.inject.Inject
 
-class WeatherViewSection
+class ExtraWeatherViewSection
 @Inject
 constructor(
     val smartspaceController: LockscreenSmartspaceController,
@@ -37,7 +37,7 @@ constructor(
         if (!MigrateClocksToBlueprint.isEnabled) return
         if (smartspaceController.isEnabled) return
 
-        constraintLayout.findViewById<View?>(R.id.weather_container)?.let {
+        constraintLayout.findViewById<View?>(R.id.extra_weather_container)?.let {
             (it.parent as ViewGroup).removeView(it)
             constraintLayout.addView(it)
         }
@@ -50,21 +50,21 @@ constructor(
 
         constraintSet.apply {
             connect(
-                R.id.weather_container,
+                R.id.extra_weather_container,
                 ConstraintSet.START,
                 R.id.keyguard_slice_view,
                 ConstraintSet.START
             )
             connect(
-                R.id.weather_container,
+                R.id.extra_weather_container,
                 ConstraintSet.END,
                 ConstraintSet.PARENT_ID,
                 ConstraintSet.END
             )
-            constrainHeight(R.id.weather_container, ConstraintSet.WRAP_CONTENT)
+            constrainHeight(R.id.extra_weather_container, ConstraintSet.WRAP_CONTENT)
 
             connect(
-                R.id.weather_container,
+                R.id.extra_weather_container,
                 ConstraintSet.TOP,
                 R.id.keyguard_slice_view,
                 ConstraintSet.BOTTOM
@@ -74,7 +74,7 @@ constructor(
                 R.id.smart_space_barrier_bottom,
                 Barrier.BOTTOM,
                 0,
-                *intArrayOf(R.id.weather_container)
+                *intArrayOf(R.id.extra_weather_container)
             )
         }
     }
@@ -83,6 +83,6 @@ constructor(
         if (!MigrateClocksToBlueprint.isEnabled) return
         if (!smartspaceController.isEnabled) return
 
-        constraintLayout.removeView(R.id.weather_container)
+        constraintLayout.removeView(R.id.extra_weather_container)
     }
 }