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

Merge "Add rounded corners to customizer decoration" into sc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2021-05-07 22:34:02 +00:00
committed by Android (Google) Code Review
parent 84dccc72e0 2bdd775bbf
commit 6765c1d932
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/res/drawable/qs_customize_tile_decoration.xml
View File

@@ -13,5 +13,8 @@
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.
--> -->
<color xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android">
android:color="?android:attr/colorBackground"/> <solid android:color="?android:attr/colorBackground"/>
<corners android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>

5
packages/SystemUI/res/layout/qs_customize_divider.xml
View File

@@ -20,8 +20,9 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="24dp"
android:paddingBottom="13dp" android:paddingBottom="24dp"
android:textAppearance="@style/TextAppearance.QSEdit.Headers" android:textAppearance="@style/TextAppearance.QSEdit.Headers"
android:text="@string/drag_to_add_tiles" /> android:text="@string/drag_to_add_tiles" />

7
packages/SystemUI/res/layout/qs_customize_panel_content.xml
View File

@@ -27,9 +27,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginLeft="@dimen/notification_side_paddings"
android:layout_marginRight="@dimen/notification_side_paddings"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/qs_customize_internal_side_paddings"
android:paddingEnd="@dimen/qs_customize_internal_side_paddings"
android:background="@drawable/qs_customizer_background"> android:background="@drawable/qs_customizer_background">
<Toolbar <Toolbar
android:id="@*android:id/action_bar" android:id="@*android:id/action_bar"
@@ -45,7 +45,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:paddingStart="@dimen/qs_customize_internal_side_paddings"
android:paddingEnd="@dimen/qs_customize_internal_side_paddings"
android:paddingBottom="28dp" android:paddingBottom="28dp"
android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:scrollIndicators="top" android:scrollIndicators="top"
android:scrollbars="vertical" android:scrollbars="vertical"

1
packages/SystemUI/res/values/dimens.xml
View File

@@ -549,6 +549,7 @@
(Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (4dp)) (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (4dp))
--> -->
<dimen name="qs_customize_header_min_height">54dp</dimen> <dimen name="qs_customize_header_min_height">54dp</dimen>
<dimen name="qs_customize_internal_side_paddings">8dp</dimen>
<dimen name="qs_tile_margin_top">18dp</dimen> <dimen name="qs_tile_margin_top">18dp</dimen>
<dimen name="qs_tile_icon_background_stroke_width">-1dp</dimen> <dimen name="qs_tile_icon_background_stroke_width">-1dp</dimen>
<dimen name="qs_tile_background_size">56dp</dimen> <dimen name="qs_tile_background_size">56dp</dimen>

6
packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
View File

@@ -690,11 +690,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
continue; continue;
} }
final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child final int top = child.getTop() + Math.round(ViewCompat.getTranslationY(child));
.getLayoutParams();
final int top = child.getTop() + params.topMargin +
Math.round(ViewCompat.getTranslationY(child));
// Draw full width, in case there aren't tiles all the way across.
mDrawable.setBounds(0, top, width, bottom); mDrawable.setBounds(0, top, width, bottom);
mDrawable.draw(c); mDrawable.draw(c);
break; break;