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

Merge "Controls UI - Various header fixes" into rvc-dev am: c2b9794471

Browse Source 
Change-Id: Iba26b44b42e7897a833539c359fb707a0e0cc2e9
This commit is contained in:
Matt Pietal
2020-03-30 13:10:49 +00:00
committed by Automerger Merge Worker
parent 162040e358 c2b9794471
commit aa69895de5
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,26 +14,29 @@
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/controls_top_margin">
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_marginTop="@dimen/controls_top_margin"
android:layout_marginEnd="@dimen/controls_header_side_margin"
android:layout_marginStart="@dimen/controls_header_side_margin">
<!-- make sure the header stays centered in the layout by adding a spacer -->
<Space
android:layout_width="@dimen/controls_header_menu_size"
android:layout_height="1dp" />
<LinearLayout
android:id="@+id/controls_header"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/controls_header_side_margin"
android:layout_marginEnd="@dimen/controls_header_side_margin"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" >
android:layout_gravity="center"
android:gravity="center">
<ImageView
android:id="@+id/app_icon"
@@ -54,16 +57,14 @@
<ImageView
android:id="@+id/controls_more"
android:src="@drawable/ic_more_vert"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="@dimen/controls_header_menu_size"
android:layout_height="@dimen/controls_header_menu_size"
android:padding="12dp"
android:layout_marginEnd="@dimen/controls_list_side_margin"
android:tint="@color/control_more_vert"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_gravity="center"
android:contentDescription="@string/accessibility_menu"
android:background="?android:attr/selectableItemBackgroundBorderless" />
</LinearLayout>
<LinearLayout
android:id="@+id/global_actions_controls_list"

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

@@ -1219,7 +1219,8 @@
<dimen name="magnifier_up_down_controls_height">40dp</dimen>
<!-- Home Controls -->
<dimen name="controls_header_side_margin">32dp</dimen>
<dimen name="controls_header_side_margin">4dp</dimen>
<dimen name="controls_header_menu_size">48dp</dimen>
<dimen name="controls_header_app_icon_size">40dp</dimen>
<dimen name="controls_list_side_margin">16dp</dimen>
<dimen name="controls_top_margin">44dp</dimen>