Snap for 11967491 from be64de1f5a8d144089b0c66055766ce5eea8a27f to 24Q3-release
Change-Id: I9948af515e93d4fccf61031eb7b35510c41d81d3
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 3c638de..2c4355f 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -10,4 +10,4 @@
flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}
[Tool Paths]
-ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar
+ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh
diff --git a/res/layout/customization_option_entry_app_grid.xml b/res/layout/customization_option_entry_app_grid.xml
index 48d493d..bc8b8fd 100644
--- a/res/layout/customization_option_entry_app_grid.xml
+++ b/res/layout/customization_option_entry_app_grid.xml
@@ -19,6 +19,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
@@ -27,7 +29,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/grid_title"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_app_grid_icon"
app:layout_constraintBottom_toTopOf="@+id/option_entry_app_grid_description"
@@ -39,7 +41,7 @@
style="@style/SectionSubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
android:text="4x4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_app_grid_icon"
@@ -48,8 +50,8 @@
<FrameLayout
android:id="@+id/option_entry_app_grid_icon"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="@dimen/customization_option_entry_icon_size"
+ android:layout_height="@dimen/customization_option_entry_icon_size"
android:orientation="horizontal"
android:background="@drawable/customization_option_entry_icon_background"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/layout/customization_option_entry_app_shape.xml b/res/layout/customization_option_entry_app_shape.xml
index 7d95274..66d9b07 100644
--- a/res/layout/customization_option_entry_app_shape.xml
+++ b/res/layout/customization_option_entry_app_shape.xml
@@ -19,6 +19,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
@@ -26,7 +28,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/preview_name_shape"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_app_shape_icon"
app:layout_constraintBottom_toBottomOf="parent"
@@ -35,8 +37,8 @@
<FrameLayout
android:id="@+id/option_entry_app_shape_icon"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="@dimen/customization_option_entry_icon_size"
+ android:layout_height="@dimen/customization_option_entry_icon_size"
android:orientation="horizontal"
android:background="@drawable/customization_option_entry_icon_background"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/layout/customization_option_entry_clock.xml b/res/layout/customization_option_entry_clock.xml
index 0abc41a..4c56916 100644
--- a/res/layout/customization_option_entry_clock.xml
+++ b/res/layout/customization_option_entry_clock.xml
@@ -19,6 +19,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
@@ -26,7 +28,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/clock_title"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_clock_icon"
app:layout_constraintBottom_toBottomOf="parent"
@@ -35,8 +37,8 @@
<FrameLayout
android:id="@+id/option_entry_clock_icon"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="@dimen/customization_option_entry_icon_size"
+ android:layout_height="@dimen/customization_option_entry_icon_size"
android:orientation="horizontal"
android:background="@drawable/customization_option_entry_icon_background"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/layout/customization_option_entry_colors.xml b/res/layout/customization_option_entry_colors.xml
index bd20dc7..cd32e74 100644
--- a/res/layout/customization_option_entry_colors.xml
+++ b/res/layout/customization_option_entry_colors.xml
@@ -19,6 +19,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
@@ -26,7 +28,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/color_picker_title"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_clock_icon"
app:layout_constraintBottom_toBottomOf="parent"
@@ -35,8 +37,8 @@
<FrameLayout
android:id="@+id/option_entry_clock_icon"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="@dimen/customization_option_entry_icon_size"
+ android:layout_height="@dimen/customization_option_entry_icon_size"
android:orientation="horizontal"
android:background="@drawable/customization_option_entry_icon_background"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/layout/customization_option_entry_keyguard_quick_affordance.xml b/res/layout/customization_option_entry_keyguard_quick_affordance.xml
index 2cfa747..aa8152d 100644
--- a/res/layout/customization_option_entry_keyguard_quick_affordance.xml
+++ b/res/layout/customization_option_entry_keyguard_quick_affordance.xml
@@ -20,6 +20,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
@@ -28,7 +30,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/keyguard_quick_affordance_title"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_keyguard_quick_affordance_icon"
app:layout_constraintBottom_toTopOf="@+id/option_entry_keyguard_quick_affordance_description"
@@ -40,7 +42,7 @@
style="@style/SectionSubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
android:text="None"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_keyguard_quick_affordance_icon"
@@ -50,8 +52,8 @@
<LinearLayout
android:id="@+id/option_entry_keyguard_quick_affordance_icon"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="@dimen/customization_option_entry_icon_size"
+ android:layout_height="@dimen/customization_option_entry_icon_size"
android:orientation="horizontal"
android:background="@drawable/customization_option_entry_icon_background"
android:divider="@drawable/horizontal_divider_14dp"
diff --git a/res/layout/customization_option_entry_more_lock_settings.xml b/res/layout/customization_option_entry_more_lock_settings.xml
index e6f2d3c..6ddbe7e 100644
--- a/res/layout/customization_option_entry_more_lock_settings.xml
+++ b/res/layout/customization_option_entry_more_lock_settings.xml
@@ -19,6 +19,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
diff --git a/res/layout/customization_option_entry_show_notifications.xml b/res/layout/customization_option_entry_show_notifications.xml
index c00d428..2a482e8 100644
--- a/res/layout/customization_option_entry_show_notifications.xml
+++ b/res/layout/customization_option_entry_show_notifications.xml
@@ -20,6 +20,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
@@ -27,7 +29,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/show_notifications_on_lock_screen"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_show_notifications_switch"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/res/layout/customization_option_entry_themed_icons.xml b/res/layout/customization_option_entry_themed_icons.xml
index be8af80..683fb0a 100644
--- a/res/layout/customization_option_entry_themed_icons.xml
+++ b/res/layout/customization_option_entry_themed_icons.xml
@@ -20,6 +20,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
android:clickable="true">
<TextView
@@ -28,7 +30,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/themed_icon_title"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_themed_icons_switch"
app:layout_constraintBottom_toTopOf="@+id/option_entry_themed_icons_description"
@@ -40,7 +42,7 @@
style="@style/SectionSubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
android:text="@string/beta_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_themed_icons_switch"