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

Merge "Rename resource name to avoid build conflict in another path." into sc-dev

Browse Source
This commit is contained in:
Edgar Wang
2021-05-11 02:28:08 +00:00
committed by Android (Google) Code Review
parent 793ae837f5 3b9df00cbb
commit ab7c9a5d79
25 changed files with 114 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/MainSwitchPreference/lint-baseline.xml
View File

@@ -7,7 +7,7 @@
errorLine1=" android:id="@android:id/switch_widget"" errorLine1=" android:id="@android:id/switch_widget""
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location <location
file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/layout/main_switch_bar.xml" file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml"
line="49" line="49"
column="9"/> column="9"/>
</issue> </issue>
@@ -15,7 +15,7 @@
<issue <issue
id="NewApi" id="NewApi"
message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)" message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)"
errorLine1=" &lt;style name=&quot;Settings.MainSwitch&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>" errorLine1=" &lt;style name=&quot;MainSwitch.Settingslib&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location <location
file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml" file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml"
@@ -26,7 +26,7 @@
<issue <issue
id="NewApi" id="NewApi"
message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)" message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)"
errorLine1=" &lt;style name=&quot;Widget.SwitchBar.Switch&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>" errorLine1=" &lt;style name=&quot;SwitchBar.Switch.Settingslib&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location <location
file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml" file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml"
@@ -37,7 +37,7 @@
<issue <issue
id="NewApi" id="NewApi"
message="`android:trackTint` requires API level 23 (current min is 21)" message="`android:trackTint` requires API level 23 (current min is 21)"
errorLine1=" &lt;item name=&quot;android:trackTint&quot;>@color/switchbar_switch_track_tint&lt;/item>" errorLine1=" &lt;item name=&quot;android:trackTint&quot;>@color/settingslib_switchbar_switch_track_tint&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location <location
file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml" file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml"

4
packages/SettingsLib/MainSwitchPreference/res/drawable/switch_bar_bg_off.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_disabled.xml
View File

@@ -19,8 +19,8 @@
android:color="?android:attr/colorControlHighlight"> android:color="?android:attr/colorControlHighlight">
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/state_off_color"/> <solid android:color="@color/settingslib_state_off_color"/>
<corners android:radius="@dimen/switch_bar_radius"/> <corners android:radius="@dimen/settingslib_switch_bar_radius"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

4
packages/SettingsLib/MainSwitchPreference/res/drawable/switch_bar_bg_on.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_off.xml
View File

@@ -19,8 +19,8 @@
android:color="?android:attr/colorControlHighlight"> android:color="?android:attr/colorControlHighlight">
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/state_on_color"/> <solid android:color="@color/settingslib_state_off_color"/>
<corners android:radius="@dimen/switch_bar_radius"/> <corners android:radius="@dimen/settingslib_switch_bar_radius"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

4
packages/SettingsLib/MainSwitchPreference/res/drawable/switch_bar_bg_disabled.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_on.xml
View File

@@ -19,8 +19,8 @@
android:color="?android:attr/colorControlHighlight"> android:color="?android:attr/colorControlHighlight">
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/state_off_color"/> <solid android:color="@color/settingslib_state_on_color"/>
<corners android:radius="@dimen/switch_bar_radius"/> <corners android:radius="@dimen/settingslib_switch_bar_radius"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

14
packages/SettingsLib/MainSwitchPreference/res/drawable/thumb_disabled.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_thumb_disabled.xml
View File

@@ -17,16 +17,16 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:top="@dimen/switch_thumb_margin" android:top="@dimen/settingslib_switch_thumb_margin"
android:left="@dimen/switch_thumb_margin" android:left="@dimen/settingslib_switch_thumb_margin"
android:right="@dimen/switch_thumb_margin" android:right="@dimen/settingslib_switch_thumb_margin"
android:bottom="@dimen/switch_thumb_margin"> android:bottom="@dimen/settingslib_switch_thumb_margin">
<shape android:shape="oval"> <shape android:shape="oval">
<size <size
android:height="@dimen/switch_thumb_size" android:height="@dimen/settingslib_switch_thumb_size"
android:width="@dimen/switch_thumb_size"/> android:width="@dimen/settingslib_switch_thumb_size"/>
<solid <solid
android:color="@color/state_off_color" android:color="@color/settingslib_state_off_color"
android:alpha="?android:attr/disabledAlpha"/> android:alpha="?android:attr/disabledAlpha"/>
</shape> </shape>
</item> </item>

14
packages/SettingsLib/MainSwitchPreference/res/drawable/thumb_on.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_thumb_off.xml
View File

@@ -17,15 +17,15 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:top="@dimen/switch_thumb_margin" android:top="@dimen/settingslib_switch_thumb_margin"
android:left="@dimen/switch_thumb_margin" android:left="@dimen/settingslib_switch_thumb_margin"
android:right="@dimen/switch_thumb_margin" android:right="@dimen/settingslib_switch_thumb_margin"
android:bottom="@dimen/switch_thumb_margin"> android:bottom="@dimen/settingslib_switch_thumb_margin">
<shape android:shape="oval"> <shape android:shape="oval">
<size <size
android:height="@dimen/switch_thumb_size" android:height="@dimen/settingslib_switch_thumb_size"
android:width="@dimen/switch_thumb_size"/> android:width="@dimen/settingslib_switch_thumb_size"/>
<solid android:color="@color/state_on_color"/> <solid android:color="@color/settingslib_state_off_color"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

14
packages/SettingsLib/MainSwitchPreference/res/drawable/thumb_off.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_thumb_on.xml
View File

@@ -17,15 +17,15 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:top="@dimen/switch_thumb_margin" android:top="@dimen/settingslib_switch_thumb_margin"
android:left="@dimen/switch_thumb_margin" android:left="@dimen/settingslib_switch_thumb_margin"
android:right="@dimen/switch_thumb_margin" android:right="@dimen/settingslib_switch_thumb_margin"
android:bottom="@dimen/switch_thumb_margin"> android:bottom="@dimen/settingslib_switch_thumb_margin">
<shape android:shape="oval"> <shape android:shape="oval">
<size <size
android:height="@dimen/switch_thumb_size" android:height="@dimen/settingslib_switch_thumb_size"
android:width="@dimen/switch_thumb_size"/> android:width="@dimen/settingslib_switch_thumb_size"/>
<solid android:color="@color/state_off_color"/> <solid android:color="@color/settingslib_state_on_color"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

6
packages/SettingsLib/MainSwitchPreference/res/drawable/track_selector.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_thumb_selector.xml
View File

@@ -16,7 +16,7 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/track_on_background" android:state_checked="true"/> <item android:drawable="@drawable/settingslib_thumb_on" android:state_checked="true"/>
<item android:drawable="@drawable/track_off_background" android:state_checked="false"/> <item android:drawable="@drawable/settingslib_thumb_off" android:state_checked="false"/>
<item android:drawable="@drawable/track_disabled_background" android:state_enabled="false"/> <item android:drawable="@drawable/settingslib_thumb_disabled" android:state_enabled="false"/>
</selector> </selector>

8
packages/SettingsLib/MainSwitchPreference/res/drawable/track_disabled_background.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_track_disabled_background.xml
View File

@@ -17,10 +17,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" android:shape="rectangle"
android:width="@dimen/switch_track_width" android:width="@dimen/settingslib_switch_track_width"
android:height="@dimen/switch_track_height"> android:height="@dimen/settingslib_switch_track_height">
<solid <solid
android:color="@color/track_off_color" android:color="@color/settingslib_track_off_color"
android:alpha="?android:attr/disabledAlpha"/> android:alpha="?android:attr/disabledAlpha"/>
<corners android:radius="@dimen/switch_track_radius"/> <corners android:radius="@dimen/settingslib_switch_track_radius"/>
</shape> </shape>

8
packages/SettingsLib/MainSwitchPreference/res/drawable/track_on_background.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_track_off_background.xml
View File

@@ -17,8 +17,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" android:shape="rectangle"
android:width="@dimen/switch_track_width" android:width="@dimen/settingslib_switch_track_width"
android:height="@dimen/switch_track_height"> android:height="@dimen/settingslib_switch_track_height">
<solid android:color="@color/track_on_color"/> <solid android:color="@color/settingslib_track_off_color"/>
<corners android:radius="@dimen/switch_track_radius"/> <corners android:radius="@dimen/settingslib_switch_track_radius"/>
</shape> </shape>

8
packages/SettingsLib/MainSwitchPreference/res/drawable/track_off_background.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_track_on_background.xml
View File

@@ -17,8 +17,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" android:shape="rectangle"
android:width="@dimen/switch_track_width" android:width="@dimen/settingslib_switch_track_width"
android:height="@dimen/switch_track_height"> android:height="@dimen/settingslib_switch_track_height">
<solid android:color="@color/track_off_color"/> <solid android:color="@color/settingslib_track_on_color"/>
<corners android:radius="@dimen/switch_track_radius"/> <corners android:radius="@dimen/settingslib_switch_track_radius"/>
</shape> </shape>

6
packages/SettingsLib/MainSwitchPreference/res/drawable/thumb_selector.xml → packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_track_selector.xml
View File

@@ -16,7 +16,7 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/thumb_on" android:state_checked="true"/> <item android:drawable="@drawable/settingslib_track_on_background" android:state_checked="true"/>
<item android:drawable="@drawable/thumb_off" android:state_checked="false"/> <item android:drawable="@drawable/settingslib_track_off_background" android:state_checked="false"/>
<item android:drawable="@drawable/thumb_disabled" android:state_enabled="false"/> <item android:drawable="@drawable/settingslib_track_disabled_background" android:state_enabled="false"/>
</selector> </selector>

20
packages/SettingsLib/MainSwitchPreference/res/layout-v31/main_switch_bar.xml → packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
View File

@@ -28,11 +28,11 @@
<LinearLayout <LinearLayout
android:id="@+id/frame" android:id="@+id/frame"
android:minHeight="@dimen/min_switch_bar_height" android:minHeight="@dimen/settingslib_min_switch_bar_height"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingLeft="@dimen/switchbar_margin_start" android:paddingLeft="@dimen/settingslib_switchbar_margin_start"
android:paddingRight="@dimen/switchbar_margin_end"> android:paddingRight="@dimen/settingslib_switchbar_margin_end">
<TextView <TextView
android:id="@+id/switch_text" android:id="@+id/switch_text"
@@ -44,16 +44,16 @@
android:maxLines="2" android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
style="@style/MainSwitchText" /> style="@style/MainSwitchText.Settingslib" />
<ImageView <ImageView
android:id="@+id/restricted_icon" android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size" android:layout_width="@dimen/settingslib_restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size" android:layout_height="@dimen/settingslib_restricted_icon_size"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"
android:theme="@android:style/Theme.Material" android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/restricted_icon_margin_end" android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"
android:src="@*android:drawable/ic_info" android:src="@*android:drawable/ic_info"
android:visibility="gone" /> android:visibility="gone" />
@@ -62,9 +62,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:track="@drawable/track_selector" android:track="@drawable/settingslib_track_selector"
android:thumb="@drawable/thumb_selector" android:thumb="@drawable/settingslib_thumb_selector"
android:theme="@style/Settings.MainSwitch"/> android:theme="@style/MainSwitch.Settingslib"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

12
packages/SettingsLib/MainSwitchPreference/res/layout/main_switch_bar.xml → packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml
View File

@@ -31,17 +31,17 @@
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
android:textSize="16sp" android:textSize="16sp"
android:textColor="?android:attr/textColorPrimaryInverse" android:textColor="?android:attr/textColorPrimaryInverse"
android:layout_marginStart="@dimen/switchbar_subsettings_margin_start" android:layout_marginStart="@dimen/settingslib_switchbar_subsettings_margin_start"
android:textAlignment="viewStart"/> android:textAlignment="viewStart"/>
<ImageView <ImageView
android:id="@+id/restricted_icon" android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size" android:layout_width="@dimen/settingslib_restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size" android:layout_height="@dimen/settingslib_restricted_icon_size"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"
android:theme="@android:style/Theme.Material" android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/restricted_icon_margin_end" android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"
android:src="@*android:drawable/ic_info" android:src="@*android:drawable/ic_info"
android:visibility="gone"/> android:visibility="gone"/>
@@ -50,7 +50,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/switchbar_subsettings_margin_end" android:layout_marginEnd="@dimen/settingslib_switchbar_subsettings_margin_end"
android:theme="@style/Widget.SwitchBar.Switch"/> android:theme="@style/SwitchBar.Switch.Settingslib"/>
</LinearLayout> </LinearLayout>

2
packages/SettingsLib/MainSwitchPreference/res/layout/main_switch_layout.xml → packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml
View File

@@ -20,7 +20,7 @@
android:layout_width="match_parent" > android:layout_width="match_parent" >
<com.android.settingslib.widget.MainSwitchBar <com.android.settingslib.widget.MainSwitchBar
android:id="@+id/main_switch_bar" android:id="@+id/settingslib_main_switch_bar"
android:visibility="gone" android:visibility="gone"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" /> android:layout_width="match_parent" />

6
packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml
View File

@@ -16,9 +16,9 @@
--> -->
<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<color name="switchbar_switch_track_tint">#82000000</color> <color name="settingslib_switchbar_switch_track_tint">#82000000</color>
<color name="switchbar_switch_thumb_tint">@android:color/black</color> <color name="settingslib_switchbar_switch_thumb_tint">@android:color/black</color>
<!-- Material next track on color--> <!-- Material next track on color-->
<color name="track_on_color">?androidprv:attr/colorSurfaceHighlight</color> <color name="settingslib_track_on_color">?androidprv:attr/colorSurfaceHighlight</color>
</resources> </resources>

2
packages/SettingsLib/MainSwitchPreference/res/values-sw600dp/dmiens.xml
View File

@@ -18,5 +18,5 @@
<resources> <resources>
<!-- SwitchBar sub settings margin start / end --> <!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">80dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_start">80dp</dimen>
</resources> </resources>

4
packages/SettingsLib/MainSwitchPreference/res/values-sw720dp-land/dmiens.xml
View File

@@ -18,6 +18,6 @@
<resources> <resources>
<!-- SwitchBar sub settings margin start / end --> <!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">128dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_start">128dp</dimen>
<dimen name="switchbar_subsettings_margin_end">128dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_end">128dp</dimen>
</resources> </resources>

4
packages/SettingsLib/MainSwitchPreference/res/values-sw720dp/dmiens.xml
View File

@@ -18,6 +18,6 @@
<resources> <resources>
<!-- SwitchBar sub settings margin start / end --> <!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">80dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_start">80dp</dimen>
<dimen name="switchbar_subsettings_margin_end">80dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_end">80dp</dimen>
</resources> </resources>

14
packages/SettingsLib/MainSwitchPreference/res/values/colors.xml
View File

@@ -16,19 +16,19 @@
--> -->
<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<color name="switchbar_background_color">@*android:color/material_grey_600</color> <color name="settingslib_switchbar_background_color">@*android:color/material_grey_600</color>
<color name="switchbar_switch_track_tint">#BFFFFFFF</color> <color name="settingslib_switchbar_switch_track_tint">#BFFFFFFF</color>
<color name="switchbar_switch_thumb_tint">@android:color/white</color> <color name="settingslib_switchbar_switch_thumb_tint">@android:color/white</color>
<!-- Material next state on color--> <!-- Material next state on color-->
<color name="state_on_color">?androidprv:attr/colorAccentPrimary</color> <color name="settingslib_state_on_color">?androidprv:attr/colorAccentPrimary</color>
<!-- Material next state off color--> <!-- Material next state off color-->
<color name="state_off_color">?androidprv:attr/colorAccentSecondary</color> <color name="settingslib_state_off_color">?androidprv:attr/colorAccentSecondary</color>
<!-- Material next track on color--> <!-- Material next track on color-->
<color name="track_on_color">?androidprv:attr/colorAccentPrimaryVariant</color> <color name="settingslib_track_on_color">?androidprv:attr/colorAccentPrimaryVariant</color>
<!-- Material next track off color--> <!-- Material next track off color-->
<color name="track_off_color">?androidprv:attr/colorAccentSecondaryVariant</color> <color name="settingslib_track_off_color">?androidprv:attr/colorAccentSecondaryVariant</color>
</resources> </resources>

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

@@ -18,42 +18,42 @@
<resources> <resources>
<!-- Size of layout margin left --> <!-- Size of layout margin left -->
<dimen name="switchbar_margin_start">24dp</dimen> <dimen name="settingslib_switchbar_margin_start">24dp</dimen>
<!-- Size of layout margin right --> <!-- Size of layout margin right -->
<dimen name="switchbar_margin_end">16dp</dimen> <dimen name="settingslib_switchbar_margin_end">16dp</dimen>
<!-- Minimum width of switch --> <!-- Minimum width of switch -->
<dimen name="min_switch_width">52dp</dimen> <dimen name="settingslib_min_switch_width">52dp</dimen>
<!-- Minimum width of switch bar --> <!-- Minimum width of switch bar -->
<dimen name="min_switch_bar_height">72dp</dimen> <dimen name="settingslib_min_switch_bar_height">72dp</dimen>
<!-- Restricted icon size in switch bar --> <!-- Restricted icon size in switch bar -->
<dimen name="restricted_icon_size">@*android:dimen/config_restrictedIconSize</dimen> <dimen name="settingslib_restricted_icon_size">@*android:dimen/config_restrictedIconSize</dimen>
<!-- Restricted icon in switch bar --> <!-- Restricted icon in switch bar -->
<dimen name="restricted_icon_margin_end">16dp</dimen> <dimen name="settingslib_restricted_icon_margin_end">16dp</dimen>
<!-- Radius of switch bar --> <!-- Radius of switch bar -->
<dimen name="switch_bar_radius">28dp</dimen> <dimen name="settingslib_switch_bar_radius">28dp</dimen>
<!-- Margin of switch thumb --> <!-- Margin of switch thumb -->
<dimen name="switch_thumb_margin">4dp</dimen> <dimen name="settingslib_switch_thumb_margin">4dp</dimen>
<!-- Size of switch thumb --> <!-- Size of switch thumb -->
<dimen name="switch_thumb_size">20dp</dimen> <dimen name="settingslib_switch_thumb_size">20dp</dimen>
<!-- Width of switch track --> <!-- Width of switch track -->
<dimen name="switch_track_width">52dp</dimen> <dimen name="settingslib_switch_track_width">52dp</dimen>
<!-- Height of switch track --> <!-- Height of switch track -->
<dimen name="switch_track_height">28dp</dimen> <dimen name="settingslib_switch_track_height">28dp</dimen>
<!-- Radius of switch track --> <!-- Radius of switch track -->
<dimen name="switch_track_radius">35dp</dimen> <dimen name="settingslib_switch_track_radius">35dp</dimen>
<!-- SwitchBar sub settings margin start / end --> <!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">72dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen>
<dimen name="switchbar_subsettings_margin_end">16dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen>
</resources> </resources>

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

@@ -17,19 +17,19 @@
<resources> <resources>
<style name="MainSwitchText"> <style name="MainSwitchText.Settingslib" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:textSize">20sp</item> <item name="android:textSize">20sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textColor">@android:color/black</item> <item name="android:textColor">@android:color/black</item>
</style> </style>
<style name="Settings.MainSwitch" parent="@android:style/Widget.Material.CompoundButton.Switch"> <style name="MainSwitch.Settingslib" parent="@android:style/Widget.Material.CompoundButton.Switch">
<item name="android:switchMinWidth">@dimen/min_switch_width</item> <item name="android:switchMinWidth">@dimen/settingslib_min_switch_width</item>
</style> </style>
<style name="Widget.SwitchBar.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch"> <style name="SwitchBar.Switch.Settingslib" parent="@android:style/Widget.Material.CompoundButton.Switch">
<item name="android:trackTint">@color/switchbar_switch_track_tint</item> <item name="android:trackTint">@color/settingslib_switchbar_switch_track_tint</item>
<item name="android:thumbTint">@color/switchbar_switch_thumb_tint</item> <item name="android:thumbTint">@color/settingslib_switchbar_switch_thumb_tint</item>
<item name="android:minHeight">48dp</item> <item name="android:minHeight">48dp</item>
<item name="android:minWidth">48dp</item> <item name="android:minWidth">48dp</item>
</style> </style>

14
packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java
View File

@@ -72,14 +72,15 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec
int defStyleRes) { int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
LayoutInflater.from(context).inflate(resourceId(context, "layout", "main_switch_bar"), LayoutInflater.from(context).inflate(
resourceId(context, "layout", "settingslib_main_switch_bar"),
this); this);
if (!BuildCompat.isAtLeastS()) { if (!BuildCompat.isAtLeastS()) {
final TypedArray a = context.obtainStyledAttributes( final TypedArray a = context.obtainStyledAttributes(
new int[]{android.R.attr.colorAccent}); new int[]{android.R.attr.colorAccent});
mBackgroundActivatedColor = a.getColor(0, 0); mBackgroundActivatedColor = a.getColor(0, 0);
mBackgroundColor = context.getColor(R.color.switchbar_background_color); mBackgroundColor = context.getColor(R.color.settingslib_switchbar_background_color);
a.recycle(); a.recycle();
} }
@@ -89,9 +90,12 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec
mFrameView = findViewById(R.id.frame); mFrameView = findViewById(R.id.frame);
mTextView = (TextView) findViewById(R.id.switch_text); mTextView = (TextView) findViewById(R.id.switch_text);
mSwitch = (Switch) findViewById(android.R.id.switch_widget); mSwitch = (Switch) findViewById(android.R.id.switch_widget);
mBackgroundOn = getContext().getDrawable(R.drawable.switch_bar_bg_on); mBackgroundOn = getContext().getDrawable(
mBackgroundOff = getContext().getDrawable(R.drawable.switch_bar_bg_off); resourceId(context, "drawable", "settingslib_switch_bar_bg_on"));
mBackgroundDisabled = getContext().getDrawable(R.drawable.switch_bar_bg_disabled); mBackgroundOff = getContext().getDrawable(
resourceId(context, "drawable", "settingslib_switch_bar_bg_off"));
mBackgroundDisabled = getContext().getDrawable(
resourceId(context, "drawable", "settingslib_switch_bar_bg_disabled"));
addOnSwitchChangeListener((switchView, isChecked) -> setChecked(isChecked)); addOnSwitchChangeListener((switchView, isChecked) -> setChecked(isChecked));

4
packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java
View File

@@ -66,13 +66,13 @@ public class MainSwitchPreference extends TwoStatePreference {
holder.setDividerAllowedAbove(false); holder.setDividerAllowedAbove(false);
holder.setDividerAllowedBelow(false); holder.setDividerAllowedBelow(false);
mMainSwitchBar = (MainSwitchBar) holder.findViewById(R.id.main_switch_bar); mMainSwitchBar = (MainSwitchBar) holder.findViewById(R.id.settingslib_main_switch_bar);
updateStatus(isChecked()); updateStatus(isChecked());
registerListenerToSwitchBar(); registerListenerToSwitchBar();
} }
private void init(Context context, AttributeSet attrs) { private void init(Context context, AttributeSet attrs) {
setLayoutResource(R.layout.main_switch_layout); setLayoutResource(R.layout.settingslib_main_switch_layout);
if (attrs != null) { if (attrs != null) {
final TypedArray a = context.obtainStyledAttributes(attrs, final TypedArray a = context.obtainStyledAttributes(attrs,

3
packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchPreferenceTest.java
View File

@@ -41,7 +41,8 @@ public class MainSwitchPreferenceTest {
@Before @Before
public void setUp() { public void setUp() {
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mRootView = View.inflate(mContext, R.layout.main_switch_layout, null /* parent */); mRootView = View.inflate(mContext, R.layout.settingslib_main_switch_layout,
null /* parent */);
mHolder = PreferenceViewHolder.createInstanceForTests(mRootView); mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
mPreference = new MainSwitchPreference(mContext); mPreference = new MainSwitchPreference(mContext);
} }