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

Merge "Update Device Controls API layout" into udc-qpr-dev

Browse Source
This commit is contained in:
Anton Potapov
2023-08-02 13:29:19 +00:00
committed by Android (Google) Code Review
parent 8228c296e8 6fc67f22d0
commit 80f819e228
16 changed files with 70 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/res-keyguard/drawable/controls_list_divider.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2023 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.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/transparent" />
<size
android:width="@dimen/control_list_horizontal_spacing"
android:height="@dimen/control_list_vertical_spacing" />
</shape>

0
packages/SystemUI/res/drawable/controls_list_divider.xml → packages/SystemUI/res/drawable/global_actions_list_divider.xml
View File

2
packages/SystemUI/res/drawable/controls_list_divider_inset.xml → packages/SystemUI/res/drawable/global_actions_list_divider_inset.xml
View File

@@ -15,6 +15,6 @@
-->
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/controls_list_divider"
android:drawable="@drawable/global_actions_list_divider"
android:insetRight="@dimen/control_spinner_padding_horizontal"
android:insetLeft="@dimen/control_spinner_padding_horizontal" />

1
packages/SystemUI/res/layout/controls_base_item.xml
View File

@@ -25,7 +25,6 @@
android:focusable="true"
android:screenReaderFocusable="true"
android:stateListAnimator="@anim/control_state_list_animator"
android:layout_marginStart="@dimen/control_spacing"
android:background="@drawable/control_background">
<ImageView

23
packages/SystemUI/res/layout/controls_list_view.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2023 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/controls_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@drawable/controls_list_divider"
android:orientation="vertical"
android:showDividers="middle" />

8
packages/SystemUI/res/layout/controls_row.xml
View File

@@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/control_spacing" />
android:divider="@drawable/controls_list_divider"
android:orientation="horizontal"
android:showDividers="middle" />

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

@@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/controls_header_menu_size"
android:paddingHorizontal="@dimen/controls_header_horizontal_padding"
android:layout_marginBottom="@dimen/controls_header_bottom_margin"
android:orientation="horizontal">
@@ -85,10 +85,11 @@
android:layout_weight="1"
android:clipChildren="true"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:padding="@dimen/controls_content_padding"
android:background="@drawable/controls_panel_background"
android:scrollbars="none">
<include layout="@layout/global_actions_controls_list_view" />
<include layout="@layout/controls_list_view" />
</ScrollView>

9
packages/SystemUI/res/layout/global_actions_controls_list_view.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/global_actions_controls_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="@dimen/global_actions_side_margin"
android:layout_marginRight="@dimen/global_actions_side_margin" />

2
packages/SystemUI/res/layout/global_actions_power_dialog.xml
View File

@@ -18,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:divider="@drawable/controls_list_divider"
android:divider="@drawable/global_actions_list_divider"
android:showDividers="middle"
/>

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

@@ -69,6 +69,9 @@
<dimen name="controls_header_horizontal_padding">12dp</dimen>
<dimen name="controls_content_margin_horizontal">16dp</dimen>
<dimen name="controls_content_padding">16dp</dimen>
<dimen name="control_list_vertical_spacing">8dp</dimen>
<dimen name="control_list_horizontal_spacing">16dp</dimen>
<!-- Rear Display Education dimens -->
<dimen name="rear_display_animation_width">246dp</dimen>

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

@@ -103,4 +103,7 @@
<dimen name="controls_header_horizontal_padding">12dp</dimen>
<dimen name="controls_content_margin_horizontal">24dp</dimen>
<dimen name="controls_content_padding">24dp</dimen>
<dimen name="control_list_vertical_spacing">8dp</dimen>
<dimen name="control_list_horizontal_spacing">16dp</dimen>
</resources>

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

@@ -24,6 +24,9 @@
<dimen name="controls_header_horizontal_padding">28dp</dimen>
<dimen name="controls_content_margin_horizontal">40dp</dimen>
<dimen name="controls_content_padding">32dp</dimen>
<dimen name="control_list_vertical_spacing">16dp</dimen>
<dimen name="control_list_horizontal_spacing">16dp</dimen>
<dimen name="large_screen_shade_header_height">56dp</dimen>

2
packages/SystemUI/res/values/colors.xml
View File

@@ -195,7 +195,7 @@
<color name="control_primary_text">#E6FFFFFF</color>
<color name="control_secondary_text">#99FFFFFF</color>
<color name="control_default_foreground">@color/GM2_grey_500</color>
<color name="control_default_background">@color/GM2_grey_900</color>
<color name="control_default_background">#303134</color>
<color name="control_spinner_dropdown">@*android:color/foreground_material_dark</color>
<color name="control_more_vert">@*android:color/foreground_material_dark</color>
<color name="control_enabled_light_background">#413C2D</color>

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

@@ -1238,6 +1238,7 @@
<dimen name="controls_header_app_icon_size">24dp</dimen>
<dimen name="controls_top_margin">48dp</dimen>
<dimen name="controls_content_margin_horizontal">0dp</dimen>
<dimen name="controls_content_padding">16dp</dimen>
<dimen name="control_header_text_size">24sp</dimen>
<dimen name="control_item_text_size">14sp</dimen>
<dimen name="control_menu_item_text_size">16sp</dimen>
@@ -1256,6 +1257,8 @@
<dimen name="control_chevron_icon_size">20dp</dimen>
<dimen name="control_spacing">8dp</dimen>
<dimen name="control_list_divider">1dp</dimen>
<dimen name="control_list_vertical_spacing">8dp</dimen>
<dimen name="control_list_horizontal_spacing">12dp</dimen>
<dimen name="control_corner_radius">14dp</dimen>
<dimen name="control_height">104dp</dimen>
<dimen name="control_padding">12dp</dimen>

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

@@ -657,7 +657,7 @@ class ControlsUiControllerImpl @Inject constructor (
val maxColumns = ControlAdapter.findMaxColumns(activityContext.resources)
val listView = parent.requireViewById(R.id.global_actions_controls_list) as ViewGroup
val listView = parent.requireViewById(R.id.controls_list) as ViewGroup
listView.removeAllViews()
var lastRow: ViewGroup = createRow(inflater, listView)
selectedStructure.controls.forEach {

2
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java
View File

@@ -87,7 +87,7 @@ public class GlobalActionsPopupMenu extends ListPopupWindow {
if (mIsDropDownMode) {
// use a divider
listView.setDividerHeight(res.getDimensionPixelSize(R.dimen.control_list_divider));
listView.setDivider(res.getDrawable(R.drawable.controls_list_divider_inset));
listView.setDivider(res.getDrawable(R.drawable.global_actions_list_divider_inset));
} else {
if (mAdapter == null) return;