Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace private attributes with public resources.

Browse Source 
The change replaces all existing usage of private resources in
SettingsLib with corresponding public resources. The only exception
is android:string/config_headlineFontFamily where there's no proper
replaccement.

The library is currently used by bundled apps (such as SettingsGoogle)
and unbundled apps (such as PermissionController and
CellBroadcastReceiver). Since we still want these bundled apps to
reference config_headlineFontFamily properly while not breaking
unbundled apps due to them referencing private attributes, we added a
new attribute settingslib_config_headlineFontFamily (alongside with
other FontFamily variance for completeness) in
SettingsTheme/res/values-v31/strings.xml which points to
config_headlineFontFamily by default. Then, in separate CLs, we will add
resource overrides to these unbundled apps to replace the value of
settingslib_config_headlineFontFamily to point to a public value. While
this means that the style of the pages from the unbundled apps will be
different from the rest of SettingsLib clients, the change provides a
tactical fix to make sure that these unbundled apps won't crash when
shipped to other devices. We can address the issue at its core by
potentially exposing some private resources in future Android releases.

Bug: 191387775
Bug: 190964071
Bug: 196106314
Test: manual test to confirm this is a no-op CL.
Change-Id: Ie25950d9f54964aa40038a27b302ed017e4e4d15
This commit is contained in:
Mill Chen
2021-08-10 15:39:14 +08:00
parent a5117ca3b4
commit 5c84edacf0
30 changed files with 180 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/BannerMessagePreference/res/values-v31/styles.xml
View File

@@ -33,18 +33,18 @@
<style name="Banner.Title.SettingsLib"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:textSize">20sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="Banner.Subtitle.SettingsLib"
parent="@*android:style/TextAppearance.DeviceDefault.Body1">
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">14sp</item>
</style>
<style name="Banner.Summary.SettingsLib"
parent="@*android:style/TextAppearance.DeviceDefault.Body1">
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">14sp</item>
</style>
@@ -58,4 +58,4 @@
parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
</resources>
</resources>

5
packages/SettingsLib/BannerMessagePreference/res/values/styles.xml
View File

@@ -17,14 +17,13 @@
<resources>
<style name="Banner.Text.Title"
parent="@android:style/TextAppearance.Material.Subhead">
parent="@android:style/TextAppearance.DeviceDefault.WindowTitle">
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="Banner.Text.Summary"
parent="@*android:style/TextAppearance.DeviceDefault.Body1">
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">14sp</item>
</style>

6
packages/SettingsLib/BarChartPreference/res/values/styles.xml
View File

@@ -85,9 +85,9 @@
</style>
<style name="BarChart.Text"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
parent="@android:style/TextAppearance.DeviceDefault.WindowTitle">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item>
</style>
<style name="BarChart.Text.HeaderTitle">
@@ -99,7 +99,7 @@
</style>
<style name="BarChart.Text.Summary"
parent="@*android:style/TextAppearance.DeviceDefault.Body1">
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">12sp</item>
</style>

1
packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
View File

@@ -19,6 +19,7 @@ android_library {
"com.google.android.material_material",
"SettingsLibSettingsTransition",
"SettingsLibUtils",
"SettingsLibSettingsTheme",
],
sdk_version: "system_current",
min_sdk_version: "29",

3
packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml
View File

@@ -16,7 +16,6 @@
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/content_parent"
android:layout_width="match_parent"
@@ -40,7 +39,7 @@
android:clipToPadding="false"
app:forceApplySystemWindowInsetTop="true"
app:extraMultilineHeightEnabled="true"
app:contentScrim="?androidprv:attr/colorSurfaceHeader"
app:contentScrim="@color/settingslib_colorSurfaceHeader"
app:maxLines="3"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:scrimAnimationDuration="50"

4
packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night/themes.xml → packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v31/themes.xml
View File

@@ -18,7 +18,7 @@
<style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight">
<item name="elevationOverlayEnabled">true</item>
<item name="elevationOverlayColor">?attr/colorPrimary</item>
<item name="colorPrimary">@*android:color/primary_dark_device_default_settings</item>
<item name="colorAccent">@*android:color/accent_device_default_dark</item>
<item name="colorPrimary">@color/settingslib_primary_dark_device_default_settings</item>
<item name="colorAccent">@color/settingslib_accent_device_default_dark</item>
</style>
</resources>

0
packages/SettingsLib/CollapsingToolbarBaseActivity/res/values/dimens.xml → packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/dimens.xml
View File

2
packages/SettingsLib/CollapsingToolbarBaseActivity/res/values/styles.xml → packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml
View File

@@ -16,7 +16,7 @@
-->
<resources>
<style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
<item name="android:textSize">20dp</item>
</style>

4
packages/SettingsLib/CollapsingToolbarBaseActivity/res/values/themes.xml → packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/themes.xml
View File

@@ -18,7 +18,7 @@
<style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight">
<item name="elevationOverlayEnabled">true</item>
<item name="elevationOverlayColor">?attr/colorPrimary</item>
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="colorPrimary">@color/settingslib_primary_device_default_settings_light</item>
<item name="colorAccent">@color/settingslib_accent_device_default_light</item>
</style>
</resources>

3
packages/SettingsLib/FooterPreference/res/values/styles.xml
View File

@@ -17,9 +17,8 @@
<resources>
<style name="TextAppearance.Footer.Title.SettingsLib"
parent="@android:style/TextAppearance.DeviceDefault.Medium">
parent="@android:style/TextAppearance.DeviceDefault.WindowTitle">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
</resources>

5
packages/SettingsLib/LayoutPreference/res/values/styles.xml
View File

@@ -24,14 +24,13 @@
</style>
<style name="TextAppearance.EntityHeaderTitle"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
parent="@android:style/TextAppearance.DeviceDefault.WindowTitle">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">20sp</item>
</style>
<style name="TextAppearance.EntityHeaderSummary"
parent="@*android:style/TextAppearance.DeviceDefault.Body1">
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textAlignment">viewStart</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:singleLine">true</item>

0
packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_disabled.xml → packages/SettingsLib/MainSwitchPreference/res/drawable-v31/settingslib_switch_bar_bg_disabled.xml
View File

0
packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_off.xml → packages/SettingsLib/MainSwitchPreference/res/drawable-v31/settingslib_switch_bar_bg_off.xml
View File

0
packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_on.xml → packages/SettingsLib/MainSwitchPreference/res/drawable-v31/settingslib_switch_bar_bg_on.xml
View File

2
packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
View File

@@ -50,7 +50,7 @@
android:tint="?android:attr/colorAccent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"
android:src="@*android:drawable/ic_info"
android:src="@android:drawable/ic_info"
android:visibility="gone" />
<Switch

4
packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml
View File

@@ -28,7 +28,7 @@
android:layout_gravity="center_vertical"
android:maxLines="2"
android:ellipsize="end"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
android:textSize="16sp"
android:textColor="?android:attr/textColorPrimaryInverse"
android:layout_marginStart="@dimen/settingslib_switchbar_subsettings_margin_start"
@@ -42,7 +42,7 @@
android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"
android:src="@*android:drawable/ic_info"
android:src="@android:drawable/ic_info"
android:visibility="gone"/>
<Switch

37
packages/SettingsLib/MainSwitchPreference/res/values-v31/dimens.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Size of layout margin -->
<dimen name="settingslib_switchbar_margin">16dp</dimen>
<!-- Size of layout margin left -->
<dimen name="settingslib_switchbar_padding_left">24dp</dimen>
<!-- Size of layout margin right -->
<dimen name="settingslib_switchbar_padding_right">16dp</dimen>
<!-- Minimum width of switch -->
<dimen name="settingslib_min_switch_width">52dp</dimen>
<!-- Minimum width of switch bar -->
<dimen name="settingslib_min_switch_bar_height">72dp</dimen>
<!-- Radius of switch bar -->
<dimen name="settingslib_switch_bar_radius">28dp</dimen>
</resources>

25
packages/SettingsLib/MainSwitchPreference/res/values-v31/styles.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<style name="MainSwitchText.Settingslib" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:textSize">20sp</item>
<item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
<item name="android:textColor">@android:color/black</item>
</style>
</resources>

22
packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 The Android Open Source Project
Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,30 +17,12 @@
<resources>
<!-- Size of layout margin -->
<dimen name="settingslib_switchbar_margin">16dp</dimen>
<!-- Size of layout margin left -->
<dimen name="settingslib_switchbar_padding_left">24dp</dimen>
<!-- Size of layout margin right -->
<dimen name="settingslib_switchbar_padding_right">16dp</dimen>
<!-- Minimum width of switch -->
<dimen name="settingslib_min_switch_width">52dp</dimen>
<!-- Minimum width of switch bar -->
<dimen name="settingslib_min_switch_bar_height">72dp</dimen>
<!-- Restricted icon size in switch bar -->
<dimen name="settingslib_restricted_icon_size">@*android:dimen/config_restrictedIconSize</dimen>
<dimen name="settingslib_restricted_icon_size">@android:dimen/config_restrictedIconSize</dimen>
<!-- Restricted icon in switch bar -->
<dimen name="settingslib_restricted_icon_margin_end">16dp</dimen>
<!-- Radius of switch bar -->
<dimen name="settingslib_switch_bar_radius">28dp</dimen>
<!-- Size of title margin -->
<dimen name="settingslib_switch_title_margin">16dp</dimen>

9
packages/SettingsLib/MainSwitchPreference/res/values/styles.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 The Android Open Source Project
Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,13 +17,6 @@
<resources>
<style name="MainSwitchText.Settingslib" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:textSize">20sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textColor">@android:color/black</item>
</style>
<style name="SwitchBar.Switch.Settingslib" parent="@android:style/Widget.Material.CompoundButton.Switch">
<item name="android:trackTint">@color/settingslib_switchbar_switch_track_tint</item>
<item name="android:thumbTint">@color/settingslib_switchbar_switch_thumb_tint</item>

18
packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98" />
</selector>

5
packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
View File

@@ -36,4 +36,9 @@
<color name="settingslib_dialog_colorError">#f28b82</color> <!-- Red 300 -->
<color name="settingslib_colorSurfaceVariant">@android:color/system_neutral1_700</color>
<color name="settingslib_colorSurfaceHeader">@android:color/system_neutral1_700</color>
<!-- copy from accent_primary_variant_dark_device_default-->
<color name="settingslib_accent_primary_variant">@android:color/system_accent1_300</color>
</resources>

23
packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
View File

@@ -37,9 +37,30 @@
<!-- Dialog accent color -->
<color name="settingslib_dialog_accent">@android:color/system_accent1_600</color>
<!-- Dialog background color -->
<color name="settingslib_dialog_background">@*android:color/surface_light</color>
<color name="settingslib_dialog_background">@color/settingslib_surface_light</color>
<!-- Dialog error color. -->
<color name="settingslib_dialog_colorError">#d93025</color> <!-- Red 600 -->
<color name="settingslib_colorSurfaceVariant">@android:color/system_neutral2_100</color>
<color name="settingslib_colorSurfaceHeader">@android:color/system_neutral1_100</color>
<color name="settingslib_accent_device_default_dark">@android:color/system_accent1_100</color>
<color name="settingslib_accent_device_default_light">@android:color/system_accent1_600</color>
<color name="settingslib_primary_dark_device_default_settings">@android:color/system_neutral1_900</color>
<color name="settingslib_primary_device_default_settings_light">@android:color/system_neutral1_50</color>
<color name="settingslib_accent_primary_device_default">@android:color/system_accent1_100</color>
<!-- copy from accent_primary_variant_light_device_default-->
<color name="settingslib_accent_primary_variant">@android:color/system_accent1_600</color>
<color name="settingslib_accent_secondary_device_default">@android:color/system_accent2_100</color>
<color name="settingslib_background_device_default_dark">@android:color/system_neutral1_900</color>
<color name="settingslib_background_device_default_light">@android:color/system_neutral1_50</color>
</resources>

1
packages/SettingsLib/SettingsTheme/res/values-v31/dimens.xml
View File

@@ -19,4 +19,5 @@
<dimen name="app_preference_padding_start">20dp</dimen>
<dimen name="app_icon_min_width">52dp</dimen>
<dimen name="settingslib_preferred_minimum_touch_target">48dp</dimen>
<dimen name="settingslib_dialogCornerRadius">28dp</dimen>
</resources>

37
packages/SettingsLib/SettingsTheme/res/values-v31/strings.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Name of a font family to use for headlines in SettingsLib. -->
<string name="settingslib_config_headlineFontFamily" translatable="false">
@*android:string/config_headlineFontFamily
</string>
<!-- Name of a font family to use for headlines-medium in SettingsLib. -->
<string name="settingslib_config_headlineFontFamilyMedium" translatable="false">
@*android:string/config_headlineFontFamilyMedium
</string>
<!-- Name of a font family to use for body in SettingsLib. -->
<string name="settingslib_config_bodyFontFamily" translatable="false">
@*android:string/config_bodyFontFamily
</string>
<!-- Name of a font family to use for body-medium in SettingsLib. -->
<string name="settingslib_config_bodyFontFamilyMedium" translatable="false">
@*android:string/config_bodyFontFamilyMedium
</string>
</resources>

8
packages/SettingsLib/SettingsTheme/res/values-v31/styles.xml
View File

@@ -16,12 +16,16 @@
-->
<resources>
<style name="TextAppearance.PreferenceTitle.SettingsLib"
parent="@*android:style/TextAppearance.DeviceDefault.ListItem">
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
<item name="android:textSize">20sp</item>
</style>
<style name="TextAppearance.CategoryTitle.SettingsLib"
parent="@*android:style/TextAppearance.DeviceDefault.Body2" />
parent="@android:style/TextAppearance.DeviceDefault.Medium">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">14sp</item>
</style>
<style name="Switch.SettingsLib" parent="@android:style/Widget.Material.CompoundButton.Switch">
<item name="android:switchMinWidth">52dp</item>

2
packages/SettingsLib/SettingsTheme/res/values-v31/themes.xml
View File

@@ -50,6 +50,6 @@
<item name="android:clipToPadding">true</item>
<item name="android:clipChildren">true</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
<item name="dialogCornerRadius">@dimen/settingslib_dialogCornerRadius</item>
</style>
</resources>

1
packages/SettingsLib/SettingsTheme/res/values/dimens.xml
View File

@@ -20,4 +20,5 @@
<dimen name="app_preference_padding_start">?android:attr/listPreferredItemPaddingStart</dimen>
<dimen name="app_icon_min_width">56dp</dimen>
<dimen name="two_target_min_width">72dp</dimen>
<dimen name="settingslib_dialogCornerRadius">8dp</dimen>
</resources>

2
packages/SettingsLib/SettingsTheme/res/values/themes.xml
View File

@@ -35,7 +35,7 @@
<!-- TODO(b/189308264): fix the crash in Android R if set the attributes:
<item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="android:colorBackground">@color/settingslib_dialog_background</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
<item name="dialogCornerRadius">@dimen/settingslib_dialogCornerRadius</item>
-->
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="android:clipToPadding">true</item>

3
packages/SettingsLib/TopIntroPreference/res/values/styles.xml
View File

@@ -16,8 +16,7 @@
-->
<resources>
<style name="TextAppearance.TopIntroText"
parent="@*android:style/TextAppearance.DeviceDefault">
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>