From c361e3426f65c45bec67a218be561812cf126303 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Wed, 21 Apr 2021 13:35:45 +0800
Subject: [PATCH] Fix background inconsistency of the Settings page in SUW

- Pass the extra arguments to target page from vision settings.
- Add the android:colorBackground to LightTheme.SubSettings.SetupWizard.

Fixes: 185873105
Bug: 184901818
Test: manual test
Change-Id: I063a8df875b727aa0e119b03dfb782c2b95dc1b5
---
 res/layout/screen_zoom_preview_1.xml                            | 1 -
 res/layout/screen_zoom_preview_settings.xml                     | 1 -
 res/values/themes.xml                                           | 1 +
 .../AccessibilitySettingsForSetupWizardActivity.java            | 2 ++
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index a0ee532b276..4aabfe4c47d 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -29,7 +29,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?android:attr/colorBackground"
             android:paddingTop="@dimen/conversation_message_list_padding"
             android:paddingStart="@dimen/conversation_message_list_padding"
             android:paddingEnd="@dimen/conversation_message_list_padding"
diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
index 998d2219608..c790e035ebf 100644
--- a/res/layout/screen_zoom_preview_settings.xml
+++ b/res/layout/screen_zoom_preview_settings.xml
@@ -19,7 +19,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:background="?android:attr/colorBackground"
     android:importantForAccessibility="noHideDescendants">
 
     <view class="com.android.settings.TouchBlockingFrameLayout"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d5376ec1357..05609daa65f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -267,6 +267,7 @@
         <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
 
         <item name="android:colorPrimary">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
         <item name="android:colorPrimaryDark">@android:color/white</item>
         <item name="android:colorAccent">@color/material_blue_700</item>
     </style>
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 2b9ca487e9b..b28e2bf05cb 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -90,6 +90,8 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
                 .setSourceMetricsCategory(caller instanceof Instrumentable
                         ? ((Instrumentable) caller).getMetricsCategory()
                         : Instrumentable.METRICS_CATEGORY_UNKNOWN)
+                .setExtras(SetupWizardUtils.copyLifecycleExtra(getIntent().getExtras(),
+                        new Bundle()))
                 .launch();
         return true;
     }