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

Merge changes I60d2b23a,I7cb15a46 into main

Browse Source 
* changes:
  [Accessibility] Color Contrast address talkback bugs
  [Accessibility] Color Contrast address UX bugs
This commit is contained in:
Marcus Ge
2024-03-26 20:26:10 +00:00
committed by Android (Google) Code Review
parent d3584a02f5 9ec6673b3f
commit 660defe7a6
7 changed files with 189 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
res/layout/accessibility_color_contrast_preview.xml
View File

@@ -21,17 +21,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/color_contrast_preview_background"
android:importantForAccessibility="no"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingBottom="24dp"
android:background="@drawable/color_contrast_preview_background">
android:paddingBottom="24dp">
<View
android:id="@+id/preview_background"
android:background="?androidprv:attr/materialColorSurface"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?androidprv:attr/materialColorSurface"
app:layout_constraintBottom_toTopOf="@+id/bottom_appbar_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -41,21 +41,20 @@
android:id="@+id/preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_margin="8dp"
android:gravity="center_horizontal"
android:text="@string/color_contrast_preview"
android:textColor="?androidprv:attr/textColorPrimary"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?androidprv:attr/textColorPrimary"
android:text="@string/color_contrast_preview" />
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/email_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="24dp"
android:background="@drawable/color_contrast_preview_dialog_background"
@@ -66,88 +65,137 @@
<ImageView
android:id="@+id/ic_group"
android:contentDescription="@null"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginTop="14dp"
android:layout_marginLeft="14dp"
android:background="@drawable/color_contrast_preview_icon_group_background"
android:contentDescription="@null"
android:padding="8dp"
android:src="@drawable/ic_group_24dp"
android:background="@drawable/color_contrast_preview_icon_group_background"
app:layout_constraintStart_toStartOf="@+id/email_background"
app:layout_constraintTop_toTopOf="@+id/email_background" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/email_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="8dp"
android:layout_marginTop="17dp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@+id/ic_star"
app:layout_constraintStart_toEndOf="@id/ic_group"
app:layout_constraintTop_toTopOf="@+id/email_background">
<TextView
android:id="@+id/sender_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="17dp"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="10dp"
android:text="@string/color_contrast_preview_sender_name"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/ic_group"
app:layout_constraintTop_toTopOf="@+id/email_background"
android:text="@string/color_contrast_preview_sender_name" />
app:layout_constraintEnd_toStartOf="@+id/email_tag"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_default="percent"
app:layout_constraintWidth_max="wrap"
app:layout_constraintWidth_percent="0.5" />
<TextView
android:id="@+id/email_tag"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/color_contrast_preview_tag_background"
android:ellipsize="end"
android:maxLines="1"
android:paddingHorizontal="4dp"
android:text="@string/color_contrast_preview_email_badge"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/sender_name"
app:layout_constraintTop_toTopOf="@+id/sender_name"
app:layout_constraintWidth_default="percent"
app:layout_constraintWidth_max="wrap"
app:layout_constraintWidth_percent="0.5" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/color_contrast_preview_email_send_date"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textSize="11sp"
app:layout_constraintStart_toStartOf="@+id/sender_name"
app:layout_constraintTop_toBottomOf="@+id/sender_name"
android:text="@string/color_contrast_preview_email_send_date" />
<TextView
android:id="@+id/email_tag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:paddingHorizontal="4dp"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:background="@drawable/color_contrast_preview_tag_background"
android:textSize="11sp"
app:layout_constraintStart_toEndOf="@+id/sender_name"
app:layout_constraintTop_toTopOf="@+id/sender_name"
android:text="@string/color_contrast_preview_email_badge" />
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_background"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/email_header"
app:layout_constraintTop_toBottomOf="@+id/email_header" />
<ImageView
android:id="@+id/ic_star"
android:contentDescription="@null"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:layout_marginRight="14dp"
android:layout_marginEnd="14dp"
android:background="@drawable/color_contrast_preview_icon_star_background"
android:contentDescription="@null"
android:padding="8dp"
android:src="@drawable/ic_star_24dp"
android:background="@drawable/color_contrast_preview_icon_star_background"
app:layout_constraintEnd_toEndOf="@+id/email_background"
app:layout_constraintTop_toTopOf="@+id/email_background" />
<View
android:id="@+id/email_main_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginHorizontal="14dp"
app:layout_constraintBottom_toBottomOf="@+id/email_background"
app:layout_constraintEnd_toEndOf="@+id/email_background"
app:layout_constraintStart_toStartOf="@+id/email_background"
app:layout_constraintTop_toBottomOf="@+id/date" />
<TextView
android:id="@+id/email_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:layout_marginTop="62dp"
android:layout_marginTop="10dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/color_contrast_preview_email_title"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="@+id/email_background"
app:layout_constraintTop_toTopOf="@+id/email_background"
android:text="@string/color_contrast_preview_email_title" />
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_main_background"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/email_main_background"
app:layout_constraintTop_toTopOf="@+id/email_main_background" />
<TextView
android:id="@+id/email_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:paddingBottom="8dp"
android:text="@string/color_contrast_preview_email_body"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textSize="12sp"
android:paddingBottom="8dp"
android:maxLines="2"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_main_background"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/email_title"
app:layout_constraintTop_toBottomOf="@+id/email_title"
android:text="@string/color_contrast_preview_email_body" />
app:layout_constraintTop_toBottomOf="@+id/email_title" />
<View
android:id="@+id/attachment_background"
@@ -161,13 +209,13 @@
<ImageView
android:id="@+id/ic_article_filled"
android:contentDescription="@null"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_article_filled_24dp"
android:contentDescription="@null"
android:paddingVertical="6dp"
android:paddingStart="8dp"
android:paddingEnd="6dp"
android:paddingVertical="6dp"
android:src="@drawable/ic_article_filled_24dp"
app:layout_constraintStart_toStartOf="@+id/email_title"
app:layout_constraintTop_toBottomOf="@+id/email_body" />
@@ -175,25 +223,31 @@
android:id="@+id/email_attachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="10dp"
android:text="@string/color_contrast_preview_email_attachment_name"
android:textColor="?androidprv:attr/materialColorOnTertiaryContainer"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/ic_article_filled"
app:layout_constraintTop_toTopOf="@+id/attachment_background"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="@+id/attachment_background"
android:text="@string/color_contrast_preview_email_attachment_name" />
app:layout_constraintEnd_toStartOf="@+id/ic_edit"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/ic_article_filled"
app:layout_constraintTop_toTopOf="@+id/attachment_background" />
<ImageView
android:id="@+id/ic_edit"
android:contentDescription="@null"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="48dp"
android:layout_marginBottom="-8dp"
android:background="@drawable/color_contrast_preview_icon_edit_background"
android:contentDescription="@null"
android:padding="27dp"
android:src="@drawable/ic_edit_24dp"
android:background="@drawable/color_contrast_preview_icon_edit_background"
app:layout_constraintEnd_toEndOf="@+id/email_background"
app:layout_constraintTop_toBottomOf="@+id/ic_star" />
app:layout_constraintBottom_toBottomOf="@+id/email_background"
app:layout_constraintEnd_toEndOf="@+id/email_background" />
<View
android:id="@+id/bottom_appbar_background"
@@ -206,9 +260,9 @@
app:layout_constraintTop_toTopOf="@+id/ic_inbox" />
<ImageView
android:contentDescription="@null"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/color_contrast_preview_icon_inbox_background"
app:layout_constraintBottom_toBottomOf="@+id/ic_inbox"
app:layout_constraintEnd_toEndOf="@+id/ic_inbox"
@@ -217,38 +271,38 @@
<ImageView
android:id="@+id/ic_inbox"
android:contentDescription="@null"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="42dp"
android:contentDescription="@null"
android:padding="24dp"
android:src="@drawable/ic_inbox_24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ic_article"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_article_filled" />
<ImageView
android:id="@+id/ic_article"
android:contentDescription="@null"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:padding="24dp"
android:src="@drawable/ic_article_24dp"
app:layout_constraintStart_toEndOf="@+id/ic_inbox"
app:layout_constraintBottom_toBottomOf="@id/ic_inbox"
app:layout_constraintEnd_toStartOf="@+id/ic_chat_bubble"
app:layout_constraintTop_toTopOf="@id/ic_inbox"
app:layout_constraintBottom_toBottomOf="@id/ic_inbox" />
app:layout_constraintStart_toEndOf="@+id/ic_inbox"
app:layout_constraintTop_toTopOf="@id/ic_inbox" />
<ImageView
android:id="@+id/ic_chat_bubble"
android:contentDescription="@null"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:padding="24dp"
android:src="@drawable/ic_chat_bubble_24dp"
app:layout_constraintBottom_toBottomOf="@id/ic_inbox"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ic_article"
app:layout_constraintTop_toTopOf="@id/ic_inbox"
app:layout_constraintBottom_toBottomOf="@id/ic_inbox" />
app:layout_constraintTop_toTopOf="@id/ic_inbox" />
</androidx.constraintlayout.widget.ConstraintLayout>

19
res/layout/accessibility_color_contrast_selector.xml
View File

@@ -23,6 +23,7 @@
android:layout_height="wrap_content">
<FrameLayout
android:contentDescription="@string/color_contrast_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/settingslib_illustration_padding"
@@ -44,12 +45,12 @@
android:layout_weight="1"/>
<LinearLayout
android:id="@+id/contrast_button_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/contrast_button_default"
android:layout_width="@dimen/contrast_button_total_size"
android:layout_height="@dimen/contrast_button_total_size"
android:background="@drawable/accessibility_contrast_button_background">
@@ -58,7 +59,7 @@
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:contentDescription="@string/contrast_default"
android:contentDescription="@null"
android:src="@drawable/ic_contrast_standard"/>
</FrameLayout>
@@ -67,6 +68,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/contrast_button_text_spacing"
android:gravity="center_horizontal|top"
android:ellipsize="end"
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_default"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
@@ -77,12 +80,12 @@
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/contrast_button_medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/contrast_button_medium"
android:layout_width="@dimen/contrast_button_total_size"
android:layout_height="@dimen/contrast_button_total_size"
android:background="@drawable/accessibility_contrast_button_background">
@@ -91,7 +94,7 @@
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:contentDescription="@string/contrast_medium"
android:contentDescription="@null"
android:src="@drawable/ic_contrast_medium"/>
</FrameLayout>
@@ -100,6 +103,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/contrast_button_text_spacing"
android:gravity="center_horizontal|top"
android:ellipsize="end"
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_medium"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
@@ -110,12 +115,12 @@
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/contrast_button_high"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/contrast_button_high"
android:layout_width="@dimen/contrast_button_total_size"
android:layout_height="@dimen/contrast_button_total_size"
android:background="@drawable/accessibility_contrast_button_background">
@@ -124,7 +129,7 @@
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:contentDescription="@string/contrast_high"
android:contentDescription="@null"
android:src="@drawable/ic_contrast_high"/>
</FrameLayout>
@@ -133,6 +138,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/contrast_button_text_spacing"
android:gravity="center_horizontal|top"
android:ellipsize="end"
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_high"
android:textColor="?androidprv:attr/materialColorOnSurface"/>

4
res/values/strings.xml
View File

@@ -4692,9 +4692,11 @@
<!-- Preview screen email title on the contrast page. [CHAR LIMIT=30] -->
<string name="color_contrast_preview_email_title">Business trip report</string>
<!-- Preview screen email body on the contrast page. [CHAR LIMIT=NONE] -->
<string name="color_contrast_preview_email_body">For further assistance, please reach out to \nmyself or Helen. This report will be</string>
<string name="color_contrast_preview_email_body">For further assistance, please reach out to myself or Helen. This report will be</string>
<!-- Preview screen email attachment name on the contrast page. [CHAR LIMIT=30] -->
<string name="color_contrast_preview_email_attachment_name">Client Expenses</string>
<!-- Title for color_contrast page footer. [CHAR LIMIT=30] -->
<string name="color_contrast_about_title">About color contrast</string>
<!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
<string name="accessibility_turn_screen_darker_title">Turn screen darker</string>
<!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->

4
res/xml/accessibility_color_contrast.xml
View File

@@ -39,8 +39,10 @@
"com.android.settings.accessibility.HighTextContrastPreferenceController" />
<com.android.settings.accessibility.AccessibilityFooterPreference
android:key="color_contrast_footer"
android:title="@string/color_contrast_note"
android:selectable="false"
settings:searchable="false"/>
settings:searchable="false"
settings:controller="com.android.settings.accessibility.ColorContrastFooterPreferenceController" />
</PreferenceScreen>

37
src/com/android/settings/accessibility/ColorContrastFooterPreferenceController.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2024 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.
*/
package com.android.settings.accessibility;
import android.content.Context;
import androidx.annotation.NonNull;
import com.android.settings.R;
/** Preference controller for footer in color contrast page. */
public class ColorContrastFooterPreferenceController extends
AccessibilityFooterPreferenceController {
public ColorContrastFooterPreferenceController(@NonNull Context context,
@NonNull String key) {
super(context, key);
}
@Override
protected String getIntroductionTitle() {
return mContext.getString(R.string.color_contrast_about_title);
}
}

4
src/com/android/settings/accessibility/ContrastSelectorPreferenceController.java
View File

@@ -26,7 +26,7 @@ import android.app.UiModeManager;
import android.content.Context;
import android.provider.Settings;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -53,7 +53,7 @@ public class ContrastSelectorPreferenceController extends BasePreferenceControll
private final Executor mMainExecutor;
private final UiModeManager mUiModeManager;
private Map<Integer, FrameLayout> mContrastButtons = new HashMap<>();
private Map<Integer, LinearLayout> mContrastButtons = new HashMap<>();
public ContrastSelectorPreferenceController(@NonNull Context context,
@NonNull String preferenceKey) {

10
tests/robotests/src/com/android/settings/accessibility/ContrastSelectorPreferenceControllerTest.java
View File

@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
import android.app.UiModeManager;
import android.content.Context;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
@@ -57,7 +57,7 @@ public class ContrastSelectorPreferenceControllerTest {
@Mock
private PreferenceScreen mScreen;
@Mock
private FrameLayout mFrameLayout;
private LinearLayout mLinearLayout;
@Mock
private LayoutPreference mLayoutPreference;
private Context mContext;
@@ -72,7 +72,7 @@ public class ContrastSelectorPreferenceControllerTest {
when(mContext.getSystemService(UiModeManager.class)).thenReturn(mUiService);
mController = new ContrastSelectorPreferenceController(mContext, PREFERENCE_KEY);
when(mScreen.findPreference(PREFERENCE_KEY)).thenReturn(mLayoutPreference);
when(mLayoutPreference.findViewById(anyInt())).thenReturn(mFrameLayout);
when(mLayoutPreference.findViewById(anyInt())).thenReturn(mLinearLayout);
}
@Test
@@ -102,7 +102,7 @@ public class ContrastSelectorPreferenceControllerTest {
public void displayPreference_shouldAddClickListener() {
mController.displayPreference(mScreen);
verify(mFrameLayout, times(3)).setOnClickListener(any());
verify(mLinearLayout, times(3)).setOnClickListener(any());
}
@Test
@@ -110,6 +110,6 @@ public class ContrastSelectorPreferenceControllerTest {
mController.displayPreference(mScreen);
mController.onContrastChanged(1);
verify(mFrameLayout, times(2)).setSelected(true);
verify(mLinearLayout, times(2)).setSelected(true);
}
}