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

Update edit shortcut dialog measurements and assets.

Browse Source 
Bug: 148837311
Test: Manual test
Change-Id: I0c018f3f39e43657cbbd45734846213c9964a268
This commit is contained in:
menghanli
2020-03-05 21:57:48 +08:00
parent 91d2dbe2d4
commit fd5143751e
12 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/accessibility_shortcut_type_hardware.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
res/drawable/accessibility_shortcut_type_software.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
res/drawable/accessibility_shortcut_type_software_gesture.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
res/drawable/accessibility_shortcut_type_software_gesture_talkback.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
res/drawable/accessibility_shortcut_type_triple_tap.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

3
res/drawable/ic_accessibility_new.xml
View File

@@ -18,7 +18,8 @@
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path <path
android:fillColor="#757575" android:fillColor="#757575"
android:pathData="M20.5,6c-2.61,0.7 -5.67,1 -8.5,1s-5.89,-0.3 -8.5,-1L3,8c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V9c2,-0.17 4.14,-0.5 6,-1l-0.5,-2zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/> android:pathData="M20.5,6c-2.61,0.7 -5.67,1 -8.5,1s-5.89,-0.3 -8.5,-1L3,8c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V9c2,-0.17 4.14,-0.5 6,-1l-0.5,-2zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>

12
res/layout/accessibility_edit_shortcut.xml
View File

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

18
res/layout/accessibility_edit_shortcut_component.xml
View File

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

43
res/layout/accessibility_edit_shortcut_magnification.xml
View File

@@ -15,26 +15,30 @@
limitations under the License limitations under the License
--> -->
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scrollbarStyle="outsideOverlay"> android:scrollbarStyle="outsideOverlay">
<LinearLayout <LinearLayout
android:theme="@style/Theme.AlertDialog"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="24dp" android:padding="24dp">
android:paddingStart="24dp"
android:paddingEnd="24dp">
<include android:id="@+id/software_shortcut" <include
layout="@layout/accessibility_edit_shortcut_component"/> 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" <include
layout="@layout/accessibility_edit_shortcut_component"/> 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 <LinearLayout
android:id="@+id/advanced_shortcut" android:id="@+id/advanced_shortcut"
@@ -45,24 +49,27 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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 <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="12dp"
android:text="@string/accessibility_shortcut_edit_dialog_title_advance" android:text="@string/accessibility_shortcut_edit_dialog_title_advance"
android:textAppearance="?android:attr/textAppearanceListItem" 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" <include
layout="@layout/accessibility_edit_shortcut_component" android:id="@+id/triple_tap_shortcut"
android:visibility="gone"/> layout="@layout/accessibility_edit_shortcut_component"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

1
src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
View File

@@ -285,7 +285,6 @@ public class AccessibilityEditDialogUtils {
final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new); final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
final ImageSpan imageSpan = new ImageSpan(icon); final ImageSpan imageSpan = new ImageSpan(icon);
imageSpan.setContentDescription(""); imageSpan.setContentDescription("");
icon.setTint(getThemeAttrColor(context, android.R.attr.textColorPrimary));
icon.setBounds(0, 0, lineHeight, lineHeight); icon.setBounds(0, 0, lineHeight, lineHeight);
spannableMessage.setSpan( spannableMessage.setSpan(
imageSpan, indexIconStart, indexIconEnd, imageSpan, indexIconStart, indexIconEnd,

1
src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
View File

@@ -178,7 +178,6 @@ public class AccessibilityGestureNavigationTutorial {
final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new); final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
final ImageSpan imageSpan = new ImageSpan(icon); final ImageSpan imageSpan = new ImageSpan(icon);
imageSpan.setContentDescription(""); imageSpan.setContentDescription("");
icon.setTint(getThemeAttrColor(context, android.R.attr.textColorPrimary));
icon.setBounds(0, 0, lineHeight, lineHeight); icon.setBounds(0, 0, lineHeight, lineHeight);
spannableMessage.setSpan( spannableMessage.setSpan(
imageSpan, indexIconStart, indexIconEnd, imageSpan, indexIconStart, indexIconEnd,

3
src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
View File

@@ -43,7 +43,6 @@ import java.util.List;
public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePreferenceFragment { public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePreferenceFragment {
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED; private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
private static final int DIALOG_ID_EDIT_SHORTCUT = 1;
private final Handler mHandler = new Handler(); private final Handler mHandler = new Handler();
private SettingsContentObserver mSettingsContentObserver; private SettingsContentObserver mSettingsContentObserver;
@@ -117,7 +116,7 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
@Override @Override
public void onSettingsClicked(ShortcutPreference preference) { public void onSettingsClicked(ShortcutPreference preference) {
super.onSettingsClicked(preference); super.onSettingsClicked(preference);
showDialog(DIALOG_ID_EDIT_SHORTCUT); showDialog(DialogEnums.EDIT_SHORTCUT);
} }
private void updateSwitchBarToggleSwitch() { private void updateSwitchBarToggleSwitch() {