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

Merge "Update controls panel layout according to the design" into tm-qpr-dev

Browse Source
This commit is contained in:
Anton Potapov
2023-02-24 17:33:49 +00:00
committed by Android (Google) Code Review
parent e448b1a4c1 97b299804b
commit 85582759df
11 changed files with 100 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/controls_panel_background.xml
View File

@@ -18,5 +18,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#1F1F1F" /> <solid android:color="#1F1F1F" />
<corners android:radius="@dimen/notification_corner_radius" /> <corners android:radius="@dimen/controls_panel_corner_radius" />
</shape> </shape>

12
packages/SystemUI/res/layout/controls_fullscreen.xml
View File

@@ -15,19 +15,11 @@
limitations under the License. limitations under the License.
--> -->
<FrameLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/control_detail_root" android:id="@+id/control_detail_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:id="@+id/global_actions_controls"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingHorizontal="@dimen/controls_padding_horizontal" />
</FrameLayout>

66
packages/SystemUI/res/layout/controls_with_favorites.xml
View File

@@ -13,72 +13,83 @@
~ 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.
--> -->
<merge <merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:tools="http://schemas.android.com/tools"
tools:orientation="vertical"
tools:parentTag="android.widget.LinearLayout">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:paddingHorizontal="@dimen/controls_header_horizontal_padding"
android:layout_marginBottom="@dimen/controls_header_bottom_margin"> android:layout_marginBottom="@dimen/controls_header_bottom_margin"
android:orientation="horizontal">
<!-- make sure the header stays centered in the layout by adding a spacer --> <!-- make sure the header stays centered in the layout by adding a spacer -->
<Space <Space
android:id="@+id/controls_spacer" android:id="@+id/controls_spacer"
android:layout_width="@dimen/controls_header_menu_size" android:layout_width="@dimen/controls_header_menu_button_size"
android:layout_height="1dp" android:layout_height="1dp"
android:visibility="gone" /> android:visibility="gone" />
<ImageView <ImageView
android:id="@+id/controls_close" android:id="@+id/controls_close"
android:contentDescription="@string/accessibility_desc_close" android:layout_width="@dimen/controls_header_menu_button_size"
android:src="@drawable/ic_close" android:layout_height="@dimen/controls_header_menu_button_size"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:tint="@color/control_primary_text" android:contentDescription="@string/accessibility_desc_close"
android:layout_width="@dimen/controls_header_menu_size"
android:layout_height="@dimen/controls_header_menu_size"
android:padding="12dp" android:padding="12dp"
android:visibility="gone" /> android:src="@drawable/ic_close"
android:tint="@color/control_primary_text"
android:visibility="gone"
tools:visibility="visible" />
<!-- need to keep this outer view in order to have a correctly sized anchor <!-- need to keep this outer view in order to have a correctly sized anchor
for the dropdown menu, as well as dropdown background in the right place --> for the dropdown menu, as well as dropdown background in the right place -->
<LinearLayout <LinearLayout
android:id="@+id/controls_header" android:id="@+id/controls_header"
android:orientation="horizontal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:minHeight="48dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:layout_weight="1"
android:gravity="center"
android:minHeight="48dp"
android:orientation="horizontal">
<TextView <TextView
style="@style/Control.Spinner.Header"
android:clickable="false"
android:id="@+id/app_or_structure_spinner" android:id="@+id/app_or_structure_spinner"
style="@style/Control.Spinner.Header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center"
android:clickable="false"
tools:text="Test app" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/controls_more" android:id="@+id/controls_more"
android:src="@drawable/ic_more_vert" android:layout_width="@dimen/controls_header_menu_button_size"
android:layout_width="@dimen/controls_header_menu_size" android:layout_height="@dimen/controls_header_menu_button_size"
android:layout_height="@dimen/controls_header_menu_size" android:layout_gravity="center_vertical"
android:padding="12dp" android:background="?android:attr/selectableItemBackgroundBorderless"
android:tint="@color/control_more_vert"
android:layout_gravity="center"
android:contentDescription="@string/accessibility_menu" android:contentDescription="@string/accessibility_menu"
android:background="?android:attr/selectableItemBackgroundBorderless" /> android:padding="12dp"
android:src="@drawable/ic_more_vert"
android:tint="@color/control_more_vert" />
</LinearLayout> </LinearLayout>
<ScrollView <ScrollView
android:id="@+id/controls_scroll_view" android:id="@+id/controls_scroll_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/controls_content_margin_horizontal"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:clipChildren="true" android:clipChildren="true"
android:orientation="vertical"
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:scrollbars="none"> android:scrollbars="none">
<include layout="@layout/global_actions_controls_list_view" /> <include layout="@layout/global_actions_controls_list_view" />
</ScrollView> </ScrollView>
@@ -87,8 +98,9 @@
android:id="@+id/controls_panel" android:id="@+id/controls_panel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/controls_content_margin_horizontal"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/controls_panel_background" android:background="@drawable/controls_panel_background"
android:visibility="gone" android:visibility="gone"
/> tools:visibility="visible" />
</merge> </merge>

3
packages/SystemUI/res/values-land/dimens.xml
View File

@@ -64,5 +64,6 @@
<dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen> <dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen>
<dimen name="controls_padding_horizontal">16dp</dimen> <dimen name="controls_header_horizontal_padding">12dp</dimen>
<dimen name="controls_content_margin_horizontal">16dp</dimen>
</resources> </resources>

3
packages/SystemUI/res/values-sw600dp/dimens.xml
View File

@@ -87,4 +87,7 @@
<!-- Biometric Auth pattern view size, better to align keyguard_security_width --> <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->
<dimen name="biometric_auth_pattern_view_size">348dp</dimen> <dimen name="biometric_auth_pattern_view_size">348dp</dimen>
<dimen name="controls_header_horizontal_padding">12dp</dimen>
<dimen name="controls_content_margin_horizontal">24dp</dimen>
</resources> </resources>

2
packages/SystemUI/res/values-sw720dp-land/dimens.xml
View File

@@ -37,6 +37,8 @@
<dimen name="qs_media_rec_album_size">112dp</dimen> <dimen name="qs_media_rec_album_size">112dp</dimen>
<dimen name="qs_media_rec_album_side_margin">16dp</dimen> <dimen name="qs_media_rec_album_side_margin">16dp</dimen>
<dimen name="controls_panel_corner_radius">40dp</dimen>
<dimen name="lockscreen_shade_max_over_scroll_amount">42dp</dimen> <dimen name="lockscreen_shade_max_over_scroll_amount">42dp</dimen>
<!-- Roughly the same distance as media on LS to media on QS. We will translate by this value <!-- Roughly the same distance as media on LS to media on QS. We will translate by this value

2
packages/SystemUI/res/values-sw720dp-port/dimens.xml
View File

@@ -33,5 +33,7 @@
side --> side -->
<dimen name="qs_tiles_page_horizontal_margin">60dp</dimen> <dimen name="qs_tiles_page_horizontal_margin">60dp</dimen>
<dimen name="controls_panel_corner_radius">46dp</dimen>
<dimen name="notification_section_divider_height">16dp</dimen> <dimen name="notification_section_divider_height">16dp</dimen>
</resources> </resources>

3
packages/SystemUI/res/values-sw720dp/dimens.xml
View File

@@ -19,7 +19,8 @@
<!-- gap on either side of status bar notification icons --> <!-- gap on either side of status bar notification icons -->
<dimen name="status_bar_icon_padding">1dp</dimen> <dimen name="status_bar_icon_padding">1dp</dimen>
<dimen name="controls_padding_horizontal">40dp</dimen> <dimen name="controls_header_horizontal_padding">28dp</dimen>
<dimen name="controls_content_margin_horizontal">40dp</dimen>
<dimen name="large_screen_shade_header_height">56dp</dimen> <dimen name="large_screen_shade_header_height">56dp</dimen>

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

@@ -1153,11 +1153,13 @@
<!-- Home Controls --> <!-- Home Controls -->
<dimen name="controls_header_menu_size">48dp</dimen> <dimen name="controls_header_menu_size">48dp</dimen>
<dimen name="controls_header_menu_button_size">48dp</dimen>
<dimen name="controls_header_bottom_margin">16dp</dimen> <dimen name="controls_header_bottom_margin">16dp</dimen>
<dimen name="controls_header_horizontal_padding">12dp</dimen>
<dimen name="controls_header_app_icon_size">24dp</dimen> <dimen name="controls_header_app_icon_size">24dp</dimen>
<dimen name="controls_top_margin">48dp</dimen> <dimen name="controls_top_margin">48dp</dimen>
<dimen name="controls_padding_horizontal">0dp</dimen> <dimen name="controls_content_margin_horizontal">0dp</dimen>
<dimen name="control_header_text_size">20sp</dimen> <dimen name="control_header_text_size">24sp</dimen>
<dimen name="control_item_text_size">16sp</dimen> <dimen name="control_item_text_size">16sp</dimen>
<dimen name="control_menu_item_text_size">16sp</dimen> <dimen name="control_menu_item_text_size">16sp</dimen>
<dimen name="control_menu_item_min_height">56dp</dimen> <dimen name="control_menu_item_min_height">56dp</dimen>
@@ -1188,6 +1190,8 @@
<item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">1.0</item> <item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">1.0</item>
<dimen name="controls_task_view_right_margin">0dp</dimen> <dimen name="controls_task_view_right_margin">0dp</dimen>
<dimen name="controls_panel_corner_radius">42dp</dimen>
<!-- Home Controls activity view detail panel--> <!-- Home Controls activity view detail panel-->
<dimen name="controls_activity_view_corner_radius">@*android:dimen/config_bottomDialogCornerRadius</dimen> <dimen name="controls_activity_view_corner_radius">@*android:dimen/config_bottomDialogCornerRadius</dimen>

4
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt
View File

@@ -68,7 +68,7 @@ class ControlsActivity @Inject constructor(
getLifecycle().addObserver( getLifecycle().addObserver(
ControlsAnimations.observerForAnimations( ControlsAnimations.observerForAnimations(
requireViewById<ViewGroup>(R.id.control_detail_root), requireViewById(R.id.control_detail_root),
window, window,
intent, intent,
!featureFlags.isEnabled(Flags.USE_APP_PANELS) !featureFlags.isEnabled(Flags.USE_APP_PANELS)
@@ -95,7 +95,7 @@ class ControlsActivity @Inject constructor(
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
parent = requireViewById<ViewGroup>(R.id.global_actions_controls) parent = requireViewById(R.id.control_detail_root)
parent.alpha = 0f parent.alpha = 0f
if (featureFlags.isEnabled(Flags.USE_APP_PANELS) && !keyguardStateController.isUnlocked) { if (featureFlags.isEnabled(Flags.USE_APP_PANELS) && !keyguardStateController.isUnlocked) {
controlsSettingsDialogManager.maybeShowDialog(this) { controlsSettingsDialogManager.maybeShowDialog(this) {

2
packages/SystemUI/src/com/android/systemui/controls/ui/PanelTaskViewController.kt
View File

@@ -71,7 +71,7 @@ class PanelTaskViewController(
taskView.post { taskView.post {
val roundedCorner = val roundedCorner =
activityContext.resources.getDimensionPixelSize( activityContext.resources.getDimensionPixelSize(
R.dimen.notification_corner_radius R.dimen.controls_panel_corner_radius
) )
val radii = FloatArray(8) { roundedCorner.toFloat() } val radii = FloatArray(8) { roundedCorner.toFloat() }
taskView.background = taskView.background =