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

Minor UI tweak on Safety settings

Browse Source 
* Move "more settings" button to top
* Changed button shape to have a more rounded corner radius.
* https://screenshot.googleplex.com/HCrnFHKAGxYcHci.png

Bug: 184261824
Test: manual
Change-Id: I907869bd459ee18eb9ba06f89f220185fdc8c276
This commit is contained in:
Fan Zhang
2021-04-05 21:47:55 +00:00
parent 1c16a3bb67
commit 32b6e7ad7a
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/layout/more_settings_button.xml
View File

@@ -14,22 +14,20 @@
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License. ~ limitations under the License.
--> -->
<LinearLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:orientation="vertical">
<Button <Button
android:id="@+id/button" android:id="@+id/button"
style="@style/ActionPrimaryButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_marginVertical="8dp"
android:layout_marginTop="20dip" android:layout_marginHorizontal="16dp"
android:layout_marginBottom="20dip" android:theme="@style/RoundedCornerThemeOverlay"
style="@style/ActionPrimaryButton" settings:allowDividerBelow="true"/>
settings:allowDividerBelow="true"
android:gravity="center" />
</LinearLayout> </FrameLayout>

4
res/values/styles.xml
View File

@@ -421,6 +421,10 @@
<style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/> <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
<style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/> <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
<style name="RoundedCornerThemeOverlay">
<item name="android:buttonCornerRadius">24dp</item>
</style>
<style name="LockPatternContainerStyle"> <style name="LockPatternContainerStyle">
<item name="android:maxHeight">400dp</item> <item name="android:maxHeight">400dp</item>
<item name="android:maxWidth">420dp</item> <item name="android:maxWidth">420dp</item>

14
res/xml/emergency_settings.xml
View File

@@ -20,6 +20,13 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="safety_and_emergency_screen" android:key="safety_and_emergency_screen"
android:title="@string/emergency_settings_preference_title"> android:title="@string/emergency_settings_preference_title">
<com.android.settingslib.widget.LayoutPreference
android:key="more_emergency_settings"
android:layout="@layout/more_settings_button"
android:order="0"
android:selectable="false"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.emergency.MoreSettingsPreferenceController" />
<Preference <Preference
android:key="gesture_emergency_summary" android:key="gesture_emergency_summary"
android:title="@string/emergency_gesture_screen_title" android:title="@string/emergency_gesture_screen_title"
@@ -27,13 +34,6 @@
android:order="100" android:order="100"
android:fragment="com.android.settings.emergency.EmergencyGestureSettings" android:fragment="com.android.settings.emergency.EmergencyGestureSettings"
settings:controller="com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController" /> settings:controller="com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController" />
<com.android.settingslib.widget.LayoutPreference
android:key="more_emergency_settings"
android:layout="@layout/more_settings_button"
android:order="180"
android:selectable="false"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.emergency.MoreSettingsPreferenceController" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings" android:key="app_and_notif_cell_broadcast_settings"
android:title="@string/cell_broadcast_settings" android:title="@string/cell_broadcast_settings"