Skip to content

UI Fix #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fauyds wants to merge 1 commit into
base: sixteen
Choose a base branch
from
Open

UI Fix #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 8 additions & 25 deletions packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2024 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.
-->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<ripple
android:color="?android:colorControlHighlight"
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:start="?android:attr/listPreferredItemPaddingStart"
android:end="?android:attr/listPreferredItemPaddingEnd"
android:top="2dp"
android:bottom="16dp">
<shape android:shape="rectangle">
android:top="2.0dip"
android:start="?android:listPreferredItemPaddingStart"
android:end="?android:listPreferredItemPaddingEnd">
<shape
android:shape="rectangle">
<solid
android:color="@color/settingslib_materialColorSurfaceBright" />
<corners
android:radius="@dimen/settingslib_preference_corner_radius" />
<padding
android:bottom="16dp"/>
</shape>
</item>
</ripple>
37 changes: 10 additions & 27 deletions packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2024 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.
-->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<ripple
android:color="?android:colorControlHighlight"
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:start="?android:attr/listPreferredItemPaddingStart"
android:end="?android:attr/listPreferredItemPaddingEnd"
android:top="2dp"
android:bottom="16dp">
<shape android:shape="rectangle">
android:top="2.0dip"
android:start="?android:listPreferredItemPaddingStart"
android:end="?android:listPreferredItemPaddingEnd">
<shape
android:shape="rectangle">
<solid
android:color="@color/settingslib_materialColorSurfaceBright" />
<corners
android:topLeftRadius="4dp"
android:topLeftRadius="16.0dip"
android:topRightRadius="16.0dip"
android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"
android:topRightRadius="4dp"
android:bottomRightRadius="@dimen/settingslib_preference_corner_radius" />
<padding
android:bottom="16dp"/>
</shape>
</item>
</ripple>
32 changes: 9 additions & 23 deletions packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2024 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.
-->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<ripple
android:color="?android:colorControlHighlight"
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:start="?android:attr/listPreferredItemPaddingStart"
android:end="?android:attr/listPreferredItemPaddingEnd"
android:top="2dp">
<shape android:shape="rectangle">
android:top="2.0dip"
android:start="?android:listPreferredItemPaddingStart"
android:end="?android:listPreferredItemPaddingEnd">
<shape
android:shape="rectangle">
<solid
android:color="@color/settingslib_materialColorSurfaceBright" />
<corners
android:radius="4dp" />
android:radius="16.0dip" />
</shape>
</item>
</ripple>
34 changes: 10 additions & 24 deletions packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2024 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.
-->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<ripple
android:color="?android:colorControlHighlight"
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:start="?android:attr/listPreferredItemPaddingStart"
android:end="?android:attr/listPreferredItemPaddingEnd"
android:top="2dp">
<shape android:shape="rectangle">
android:top="2.0dip"
android:start="?android:listPreferredItemPaddingStart"
android:end="?android:listPreferredItemPaddingEnd">
<shape
android:shape="rectangle">
<solid
android:color="@color/settingslib_materialColorSurfaceBright" />
<corners
android:topLeftRadius="@dimen/settingslib_preference_corner_radius"
android:bottomLeftRadius="4dp"
android:topRightRadius="@dimen/settingslib_preference_corner_radius"
android:bottomRightRadius="4dp" />
android:bottomLeftRadius="16.0dip"
android:bottomRightRadius="16.0dip" />
</shape>
</item>
</ripple>
7 changes: 7 additions & 0 deletions packages/SettingsLib/SettingsTheme/res/layout/preference_category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
android:id="@android:id/title"
android:layout_width="fill_parent"
android:layout_height="8.0dip"
style="?android:listSeparatorTextViewStyle"
xmlns:android="http://schemas.android.com/apk/res/android" />
2 changes: 1 addition & 1 deletion packages/SettingsLib/SettingsTheme/res/layout/settingslib_preference_category_no_title.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="16dp"
android:baselineAligned="false"
android:filterTouchesWhenObscured="false">
</LinearLayout>