From 275e841c7b82c2c4fc2c69a2afd7dc15ac5f23cd Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 4 Dec 2019 07:09:23 -0800 Subject: [PATCH 1/4] Import translations. DO NOT MERGE Change-Id: Ia7ef20643a0f85e3805cdcbc4a43aae07c433bd2 Auto-generated-cl: translation import --- res/values-mr/strings.xml | 4 ++-- res/values-or/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 3ae8f1ad15..40a3a1e4d3 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -47,7 +47,7 @@ "आवडीच्या ट्रे मध्ये आणखी जागा नाही" "अ‍ॅप्स सूची" "वैयक्तिक अ‍ॅप्स सूची" - "कामाच्या ठिकाणी वापरली जाणाऱ्या अॅप्सची सूची" + "कामाच्या ठिकाणी वापरली जाणाऱ्या ॲप्सची सूची" "होम" "काढा" "अनइंस्टॉल करा" @@ -93,7 +93,7 @@ "सेटिंग्ज बदला" "सूचना बिंदू दाखवा" "होम स्क्रीनवर आयकन जोडा" - "नवीन अॅप्ससाठी" + "नवीन ॲप्ससाठी" "अज्ञात" "काढा" "शोधा" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index ab42923019..0b3fb99e58 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -86,7 +86,7 @@ "ହୋମ୍‌ ସ୍କ୍ରୀନ୍ ବୁଲାଇବା ଅନୁମତି ଦିଅନ୍ତୁ" "ଯେତେବେଳେ ଫୋନକୁ ବୁଲାଯାଇଥାଏ" "ବିଜ୍ଞପ୍ତି ଡଟ୍ସ" - "ଚାଲୁ କରନ୍ତୁ" + "ଚାଲୁ" "ବନ୍ଦ କରନ୍ତୁ" "ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌ ଆବଶ୍ୟକ ଅଟେ" "ବିଜ୍ଞପ୍ତି ବିନ୍ଦୁ ଦେଖାଇବାକୁ, %1$s ପାଇଁ ଆପ୍‌ ବିଜ୍ଞପ୍ତି ଅନ୍‌ କରନ୍ତୁ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 68859605fb..1cf09051ae 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -130,7 +130,7 @@ "Szerokość i wysokość widżetu zmieniła się na %1$s x %2$s" "Skróty" "Skróty i powiadomienia" - "Odrzuć" + "Zamknij" "Powiadomienie odrzucone" "Osobiste" "Praca" From 6a38180482352b450fdd233c440c8e4b00ffd0f3 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 4 Dec 2019 07:12:46 -0800 Subject: [PATCH 2/4] Import translations. DO NOT MERGE Change-Id: If3f89987d7cbcad1ab77400785235af4e17debcf Auto-generated-cl: translation import --- res/values-mr/strings.xml | 4 ++-- res/values-or/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index f71bbd9024..69eb5ee304 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -46,7 +46,7 @@ "आवडीच्या ट्रे मध्ये आणखी जागा नाही" "अ‍ॅप्स सूची" "वैयक्तिक अ‍ॅप्स सूची" - "कामाच्या ठिकाणी वापरली जाणाऱ्या अॅप्सची सूची" + "कामाच्या ठिकाणी वापरली जाणाऱ्या ॲप्सची सूची" "होम" "काढा" "अनइंस्टॉल करा" @@ -92,7 +92,7 @@ "सेटिंग्ज बदला" "सूचना बिंदू दाखवा" "होम स्क्रीनवर आयकन जोडा" - "नवीन अॅप्ससाठी" + "नवीन ॲप्ससाठी" "अज्ञात" "काढा" "शोधा" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 37bd2d5f8b..2479d1bdf4 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -85,7 +85,7 @@ "ହୋମ୍‌ ସ୍କ୍ରୀନ୍ ବୁଲାଇବା ଅନୁମତି ଦିଅନ୍ତୁ" "ଯେତେବେଳେ ଫୋନକୁ ବୁଲାଯାଇଥାଏ" "ବିଜ୍ଞପ୍ତି ଡଟ୍ସ" - "ଚାଲୁ କରନ୍ତୁ" + "ଚାଲୁ" "ବନ୍ଦ କରନ୍ତୁ" "ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌ ଆବଶ୍ୟକ ଅଟେ" "ବିଜ୍ଞପ୍ତି ବିନ୍ଦୁ ଦେଖାଇବାକୁ, %1$s ପାଇଁ ଆପ୍‌ ବିଜ୍ଞପ୍ତି ଅନ୍‌ କରନ୍ତୁ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5d9b50e4f8..48c8baff0d 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -129,7 +129,7 @@ "Szerokość i wysokość widżetu zmieniła się na %1$s x %2$s" "Skróty" "Skróty i powiadomienia" - "Odrzuć" + "Zamknij" "Powiadomienie odrzucone" "Osobiste" "Praca" From 02c794578c380745341956f1441d4c12798ae13f Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Wed, 4 Dec 2019 14:20:27 -0800 Subject: [PATCH 3/4] Persist predicted items when dragged to workspace Bug: 143787549 Test: Manual Change-Id: Ieff0ede4072a2a9a87a62b06ad846eedfe97583f --- src/com/android/launcher3/model/ModelWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java index c69ace946c..bdf3a6918d 100644 --- a/src/com/android/launcher3/model/ModelWriter.java +++ b/src/com/android/launcher3/model/ModelWriter.java @@ -103,7 +103,7 @@ public class ModelWriter { */ public void addOrMoveItemInDatabase(ItemInfo item, int container, int screenId, int cellX, int cellY) { - if (item.container == ItemInfo.NO_ID) { + if (item.id == ItemInfo.NO_ID) { // From all apps addItemToDatabase(item, container, screenId, cellX, cellY); } else { From 9c592e210e3f8cdc988db39ac72c3d29c13250a2 Mon Sep 17 00:00:00 2001 From: Pinyao Ting Date: Thu, 5 Dec 2019 11:00:11 -0800 Subject: [PATCH 4/4] perform accessbility focus when the recyclerview doesn't gain focus after fragment replacement in SettingsActivity Bug: 145475911 Test: Settings -> App & Notifications -> Default Apps -> Enable Talkback -> Gear Button next to Home app -> About -> Verify Talkback reads the first item in the page Change-Id: I100e646ad2aba0081b48b86ec408ce8e76a80713 Merged-In: I100e646ad2aba0081b48b86ec408ce8e76a80713 (cherry picked from commit 865dc9b3b17084c73cf07868b115cc7710b7dfc1) --- .../launcher3/settings/SettingsActivity.java | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java index 18b6094fb0..8d2db78c7c 100644 --- a/src/com/android/launcher3/settings/SettingsActivity.java +++ b/src/com/android/launcher3/settings/SettingsActivity.java @@ -16,6 +16,8 @@ package com.android.launcher3.settings; +import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS; + import static com.android.launcher3.SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY; import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY; import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue; @@ -32,14 +34,7 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; -import com.android.launcher3.LauncherFiles; -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.graphics.GridOptionsProvider; -import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper; -import com.android.launcher3.util.SecureSettingsObserver; - +import androidx.annotation.NonNull; import androidx.preference.Preference; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceFragment.OnPreferenceStartFragmentCallback; @@ -48,6 +43,14 @@ import androidx.preference.PreferenceGroup.PreferencePositionCallback; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; +import com.android.launcher3.LauncherFiles; +import com.android.launcher3.R; +import com.android.launcher3.Utilities; +import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.graphics.GridOptionsProvider; +import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper; +import com.android.launcher3.util.SecureSettingsObserver; + /** * Settings activity for Launcher. Currently implements the following setting: Allow rotation */ @@ -248,6 +251,8 @@ public class SettingsActivity extends Activity if (highlighter != null) { getView().postDelayed(highlighter, DELAY_HIGHLIGHT_DURATION_MILLIS); mPreferenceHighlighted = true; + } else { + requestAccessibilityFocus(getListView()); } } } @@ -268,6 +273,15 @@ public class SettingsActivity extends Activity return position >= 0 ? new PreferenceHighlighter(list, position) : null; } + private void requestAccessibilityFocus(@NonNull final RecyclerView rv) { + rv.post(() -> { + if (!rv.hasFocus() && rv.getChildCount() > 0) { + rv.getChildAt(0) + .performAccessibilityAction(ACTION_ACCESSIBILITY_FOCUS, null); + } + }); + } + @Override public void onDestroy() { if (mNotificationDotsObserver != null) {