PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-21 13:06:45 +00:00
committed by Android (Google) Code Review
parent ee2086872e c361e3426f
commit 7f065adfcb
4 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/screen_zoom_preview_1.xml
View File

@@ -29,7 +29,6 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:paddingTop="@dimen/conversation_message_list_padding" android:paddingTop="@dimen/conversation_message_list_padding"
android:paddingStart="@dimen/conversation_message_list_padding" android:paddingStart="@dimen/conversation_message_list_padding"
android:paddingEnd="@dimen/conversation_message_list_padding" android:paddingEnd="@dimen/conversation_message_list_padding"

1
res/layout/screen_zoom_preview_settings.xml
View File

@@ -19,7 +19,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true" android:fillViewport="true"
android:background="?android:attr/colorBackground"
android:importantForAccessibility="noHideDescendants"> android:importantForAccessibility="noHideDescendants">
<view class="com.android.settings.TouchBlockingFrameLayout" <view class="com.android.settings.TouchBlockingFrameLayout"

1
res/values/themes.xml
View File

@@ -253,6 +253,7 @@
<item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item> <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
<item name="android:colorPrimary">@android:color/white</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:colorPrimaryDark">@android:color/white</item>
<item name="android:colorAccent">@color/material_blue_700</item> <item name="android:colorAccent">@color/material_blue_700</item>
</style> </style>

2
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
View File

@@ -90,6 +90,8 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
.setSourceMetricsCategory(caller instanceof Instrumentable .setSourceMetricsCategory(caller instanceof Instrumentable
? ((Instrumentable) caller).getMetricsCategory() ? ((Instrumentable) caller).getMetricsCategory()
: Instrumentable.METRICS_CATEGORY_UNKNOWN) : Instrumentable.METRICS_CATEGORY_UNKNOWN)
.setExtras(SetupWizardUtils.copyLifecycleExtra(getIntent().getExtras(),
new Bundle()))
.launch(); .launch();
return true; return true;
} }