Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev

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"

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"

res/values/themes.xml

@@ -253,6 +253,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>

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;
     }