Merge "Fix the problem that the switch should gray out when preference disabled." into sc-dev
This commit is contained in:
Stanley Wang
@@ -1,33 +0,0 @@
|
|||||||
<?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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
|
||||||
android:top="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:left="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:right="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:bottom="@dimen/settingslib_switch_thumb_margin">
|
|
||||||
<shape android:shape="oval">
|
|
||||||
<size
|
|
||||||
android:height="@dimen/settingslib_switch_thumb_size"
|
|
||||||
android:width="@dimen/settingslib_switch_thumb_size"/>
|
|
||||||
<solid
|
|
||||||
android:color="@color/settingslib_thumb_off_color"
|
|
||||||
android:alpha="?android:attr/disabledAlpha"/>
|
|
||||||
</shape>
|
|
||||||
</item>
|
|
||||||
</layer-list>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2020 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
|
||||||
android:top="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:left="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:right="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:bottom="@dimen/settingslib_switch_thumb_margin">
|
|
||||||
<shape android:shape="oval">
|
|
||||||
<size
|
|
||||||
android:height="@dimen/settingslib_switch_thumb_size"
|
|
||||||
android:width="@dimen/settingslib_switch_thumb_size"/>
|
|
||||||
<solid android:color="@color/settingslib_thumb_off_color"/>
|
|
||||||
</shape>
|
|
||||||
</item>
|
|
||||||
</layer-list>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2020 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
|
||||||
android:top="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:left="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:right="@dimen/settingslib_switch_thumb_margin"
|
|
||||||
android:bottom="@dimen/settingslib_switch_thumb_margin">
|
|
||||||
<shape android:shape="oval">
|
|
||||||
<size
|
|
||||||
android:height="@dimen/settingslib_switch_thumb_size"
|
|
||||||
android:width="@dimen/settingslib_switch_thumb_size"/>
|
|
||||||
<solid android:color="@color/settingslib_state_on_color"/>
|
|
||||||
</shape>
|
|
||||||
</item>
|
|
||||||
</layer-list>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2020 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:drawable="@drawable/settingslib_thumb_on" android:state_checked="true"/>
|
|
||||||
<item android:drawable="@drawable/settingslib_thumb_off" android:state_checked="false"/>
|
|
||||||
<item android:drawable="@drawable/settingslib_thumb_disabled" android:state_enabled="false"/>
|
|
||||||
</selector>
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
<?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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="rectangle"
|
|
||||||
android:width="@dimen/settingslib_switch_track_width"
|
|
||||||
android:height="@dimen/settingslib_switch_track_height">
|
|
||||||
<solid
|
|
||||||
android:color="@color/settingslib_track_off_color"
|
|
||||||
android:alpha="?android:attr/disabledAlpha"/>
|
|
||||||
<corners android:radius="@dimen/settingslib_switch_track_radius"/>
|
|
||||||
</shape>
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2020 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="rectangle"
|
|
||||||
android:width="@dimen/settingslib_switch_track_width"
|
|
||||||
android:height="@dimen/settingslib_switch_track_height">
|
|
||||||
<solid android:color="@color/settingslib_track_off_color"/>
|
|
||||||
<corners android:radius="@dimen/settingslib_switch_track_radius"/>
|
|
||||||
</shape>
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2020 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="rectangle"
|
|
||||||
android:width="@dimen/settingslib_switch_track_width"
|
|
||||||
android:height="@dimen/settingslib_switch_track_height">
|
|
||||||
<solid android:color="@color/settingslib_track_on_color"/>
|
|
||||||
<corners android:radius="@dimen/settingslib_switch_track_radius"/>
|
|
||||||
</shape>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2020 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:drawable="@drawable/settingslib_track_on_background" android:state_checked="true"/>
|
|
||||||
<item android:drawable="@drawable/settingslib_track_off_background" android:state_checked="false"/>
|
|
||||||
<item android:drawable="@drawable/settingslib_track_disabled_background" android:state_enabled="false"/>
|
|
||||||
</selector>
|
|
||||||
@@ -60,9 +60,7 @@
|
|||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
android:track="@drawable/settingslib_track_selector"
|
android:theme="@style/Switch.SettingsLib"/>
|
||||||
android:thumb="@drawable/settingslib_thumb_selector"
|
|
||||||
android:theme="@style/MainSwitch.Settingslib"/>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -41,21 +41,6 @@
|
|||||||
<!-- Radius of switch bar -->
|
<!-- Radius of switch bar -->
|
||||||
<dimen name="settingslib_switch_bar_radius">28dp</dimen>
|
<dimen name="settingslib_switch_bar_radius">28dp</dimen>
|
||||||
|
|
||||||
<!-- Margin of switch thumb -->
|
|
||||||
<dimen name="settingslib_switch_thumb_margin">4dp</dimen>
|
|
||||||
|
|
||||||
<!-- Size of switch thumb -->
|
|
||||||
<dimen name="settingslib_switch_thumb_size">20dp</dimen>
|
|
||||||
|
|
||||||
<!-- Width of switch track -->
|
|
||||||
<dimen name="settingslib_switch_track_width">52dp</dimen>
|
|
||||||
|
|
||||||
<!-- Height of switch track -->
|
|
||||||
<dimen name="settingslib_switch_track_height">28dp</dimen>
|
|
||||||
|
|
||||||
<!-- Radius of switch track -->
|
|
||||||
<dimen name="settingslib_switch_track_radius">35dp</dimen>
|
|
||||||
|
|
||||||
<!-- SwitchBar sub settings margin start / end -->
|
<!-- SwitchBar sub settings margin start / end -->
|
||||||
<dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen>
|
<dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen>
|
||||||
<dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen>
|
<dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen>
|
||||||
|
|||||||
@@ -23,9 +23,6 @@
|
|||||||
<item name="android:textColor">@android:color/black</item>
|
<item name="android:textColor">@android:color/black</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="MainSwitch.Settingslib" parent="@android:style/Widget.Material.CompoundButton.Switch">
|
|
||||||
<item name="android:switchMinWidth">@dimen/settingslib_min_switch_width</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="SwitchBar.Switch.Settingslib" parent="@android:style/Widget.Material.CompoundButton.Switch">
|
<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:trackTint">@color/settingslib_switchbar_switch_track_tint</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user