From ca8e34e073c88dbeadc2136c3ecf88f186ae6243 Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Sun, 23 Apr 2023 15:08:58 +0800
Subject: [PATCH 1/3] Change battery usage screen component name

Bug: 278022529
Test: manual
Change-Id: Ief9c2d83d1eae06047d64578886c0e1572bdcf0d
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a366ac78bfa..f5e47cd7aa4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5291,7 +5291,7 @@
     <string name="battery_missing_link_a11y_message">Tap to learn more about this error</string>
 
     <!-- Label for power consumed by the screen -->
-    <string name="power_screen">Display</string>
+    <string name="power_screen">Screen</string>
     <!-- Label for power consumed by the CPU -->
     <string name="power_cpu">CPU</string>
     <!-- Label for power consumed by the flashlight -->

From 179fc5e1f1f67adae0140e35d7129cea62d52486 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Mon, 24 Apr 2023 12:29:34 +0800
Subject: [PATCH 2/3] Avoid unnecessary re-creating of Wi-Fi password dialog

- The Wi-Fi password dialog will be re-created on larger devices, this behavior is unnecessary.

- Modify AndroidManifest to avoid WifiDialogActivity re-creating.

Bug: 259986151
Test: manual test on the device

Change-Id: I394b5ff6d1e0f51c4b2aec270541ce04d6ace9a4
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d9e1735b3e3..e3cc5652ac8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3805,7 +3805,7 @@
             android:documentLaunchMode="always"
             android:exported="true"
             android:permission="android.permission.CHANGE_WIFI_STATE"
-            android:configChanges="orientation|keyboardHidden|screenSize">
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|smallestScreenSize|screenLayout">
             <intent-filter>
                 <action android:name="com.android.settings.WIFI_DIALOG" />
                 <category android:name="android.intent.category.DEFAULT" />

From 8b1f85aaac0626f06c14fcaa591010002e5360b8 Mon Sep 17 00:00:00 2001
From: Angela Wang <angelala@google.com>
Date: Mon, 10 Apr 2023 08:49:07 +0000
Subject: [PATCH 3/3] Logs Flash Notifications toggle event

Logs the toggle event of different kind of flash notification to better know about how many usage of these feature and make it as our success metrics.

Bug: 277552681
Test: m statsd_testdrive && statsd_testdrive 513, checks the metrics manually
Change-Id: I73068744b7eef391ee459314da21c23cf64ef212
---
 .../CameraFlashNotificationPreferenceController.java      | 4 +++-
 .../ScreenFlashNotificationPreferenceController.java      | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java b/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
index f19795fa8de..8b9b8883294 100644
--- a/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
+++ b/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
@@ -24,7 +24,7 @@ import android.provider.Settings;
 
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
-
+import com.android.settings.overlay.FeatureFactory;
 
 /**
  * Controller for Camera flash notification.
@@ -49,6 +49,8 @@ public class CameraFlashNotificationPreferenceController extends TogglePreferenc
 
     @Override
     public boolean setChecked(boolean isChecked) {
+        FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().changed(
+                getMetricsCategory(), getPreferenceKey(), isChecked ? 1 : 0);
         return Settings.System.putInt(mContext.getContentResolver(),
                 Settings.System.CAMERA_FLASH_NOTIFICATION, (isChecked ? ON : OFF));
     }
diff --git a/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java b/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
index 2b96dcffb86..53abc95efb7 100644
--- a/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
+++ b/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
@@ -30,6 +30,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
 
 import java.util.function.Consumer;
 
@@ -62,8 +63,11 @@ public class ScreenFlashNotificationPreferenceController extends TogglePreferenc
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        if (isChecked) checkAndSetInitialColor();
-
+        FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().changed(
+                getMetricsCategory(), getPreferenceKey(), isChecked ? 1 : 0);
+        if (isChecked) {
+            checkAndSetInitialColor();
+        }
         return Settings.System.putInt(mContext.getContentResolver(),
                 Settings.System.SCREEN_FLASH_NOTIFICATION, (isChecked ? ON : OFF));
     }