PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update edit shortcut dialog measurements and assets." into rvc-dev

Browse Source
This commit is contained in:
Menghan Li
2020-03-06 08:01:59 +00:00
committed by Android (Google) Code Review
parent 2d15cecf54 fd5143751e
commit b6ab224ddb
12 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/accessibility_edit_shortcut.xml
View File

@@ -22,19 +22,19 @@
android:scrollbarStyle="outsideOverlay">
<LinearLayout
android:theme="@style/Theme.AlertDialog"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="24dp"
android:paddingStart="24dp"
android:paddingEnd="24dp">
android:padding="24dp">
<include android:id="@+id/software_shortcut"
layout="@layout/accessibility_edit_shortcut_component"/>
layout="@layout/accessibility_edit_shortcut_component"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp" />
<include android:id="@+id/hardware_shortcut"
layout="@layout/accessibility_edit_shortcut_component"/>
layout="@layout/accessibility_edit_shortcut_component" />
</LinearLayout>

18
res/layout/accessibility_edit_shortcut_component.xml
View File

@@ -19,32 +19,32 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp">
android:orientation="vertical">
<CheckBox
android:id="@+id/checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="12dp"
android:saveEnabled="false"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/textColorAlertDialogListItem" />
android:textColor="?android:attr/textColorAlertDialogListItem"
android:textSize="16sp" />
<TextView
android:id="@+id/summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:paddingStart="32dp"
android:paddingStart="44dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary" />
<ImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="32dp"
android:scaleType="fitCenter" />
android:layout_width="176dp"
android:layout_height="176dp"
android:layout_marginStart="44dp"
android:scaleType="centerCrop" />
</LinearLayout>

43
res/layout/accessibility_edit_shortcut_magnification.xml
View File

@@ -15,26 +15,30 @@
limitations under the License
-->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="outsideOverlay">
<LinearLayout
android:theme="@style/Theme.AlertDialog"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="24dp"
android:paddingStart="24dp"
android:paddingEnd="24dp">
android:padding="24dp">
<include android:id="@+id/software_shortcut"
layout="@layout/accessibility_edit_shortcut_component"/>
<include
android:id="@+id/software_shortcut"
layout="@layout/accessibility_edit_shortcut_component"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp" />
<include android:id="@+id/hardware_shortcut"
layout="@layout/accessibility_edit_shortcut_component"/>
<include
android:id="@+id/hardware_shortcut"
layout="@layout/accessibility_edit_shortcut_component"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp" />
<LinearLayout
android:id="@+id/advanced_shortcut"
@@ -45,24 +49,27 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_keyboard_arrow_down"
android:scaleType="fitCenter"/>
android:scaleType="fitCenter"
android:src="@drawable/ic_keyboard_arrow_down" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="12dp"
android:text="@string/accessibility_shortcut_edit_dialog_title_advance"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/colorAccent" />
android:textColor="?android:attr/colorAccent"
android:textSize="16sp" />
</LinearLayout>>
</LinearLayout>
<include android:id="@+id/triple_tap_shortcut"
layout="@layout/accessibility_edit_shortcut_component"
android:visibility="gone"/>
<include
android:id="@+id/triple_tap_shortcut"
layout="@layout/accessibility_edit_shortcut_component"
android:visibility="gone" />
</LinearLayout>
</ScrollView>
</ScrollView>