From f2bf3503030f9164beedab88508ff8c4781d1c36 Mon Sep 17 00:00:00 2001 From: tom hsu Date: Fri, 26 May 2023 17:52:11 +0800 Subject: [PATCH 1/5] [Settings] Remove redundant sort - Use sql command to sort subscription info data instead of current. Bug: 284306899 Test: Manual test Change-Id: Ie0c5f5614a336771f865f02e7675b4e125ff15bb --- src/com/android/settings/network/MobileNetworkRepository.java | 1 - .../android/settings/network/MobileNetworkSummaryController.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java index e55ba26e106..b2f2e2e2ea7 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java @@ -388,7 +388,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions mActiveSubInfoEntityList = availableSubInfoEntityList.stream() .filter(SubscriptionInfoEntity::isActiveSubscription) .filter(SubscriptionInfoEntity::isSubscriptionVisible) - .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex)) .collect(Collectors.toList()); if (DEBUG) { Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = " diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java index 1474836d7f1..f924636463d 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryController.java +++ b/src/com/android/settings/network/MobileNetworkSummaryController.java @@ -134,7 +134,6 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController return mContext.getString(R.string.mobile_network_tap_to_activate, displayName); } else { return mSubInfoEntityList.stream() - .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex)) .map(SubscriptionInfoEntity::getUniqueDisplayName) .collect(Collectors.joining(", ")); } From 3bf713062848128042c8c1660ed25c16002720a0 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 26 May 2023 14:57:59 -0400 Subject: [PATCH 2/5] Update string to be phone/tablet agnostic Test: View NotificationChannel UI Fixes: 279155066 Change-Id: I6d02a863a27092e35e66023966b3e007c6b45d7b --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index ed2b77d5871..e191c4255f5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7888,7 +7888,7 @@ No sound or vibration and appears lower in conversation section - May ring or vibrate based on phone settings + May ring or vibrate based on device settings When device is unlocked, show notifications as a banner across the top of the screen From 94906cfe3d9fb8bfd40e38a660ae9a896ff661be Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Mon, 29 May 2023 16:59:36 +0000 Subject: [PATCH 3/5] Update activity name for ManageFullScreenIntent Bug: 243421660 Change-Id: I3397d6d59895694185c0d9067da636623c08d3ac Test: m Settings Test: adb shell am start -n com.android.settings/.ManageFullScreenIntent --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5904282dd97..db2d3b24d12 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1707,14 +1707,14 @@ android:value="@string/menu_key_apps"/> - - From 1f76872d780f64d87a2a923d9fd10f487fb15f41 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Fri, 26 May 2023 17:15:30 +0000 Subject: [PATCH 4/5] [Panlingual] Remove the large space when searching language Don't expand the tool bar when users search the language because they will see a large space on the top. Bug: 284480214 Test: local test Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35 Merged-In: Ie8653536117a999bd420ccfce961b17fe9349d35 --- .../settings/localepicker/AppLocalePickerActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java index 9efaf63c687..092207bdcf5 100644 --- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java +++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java @@ -29,6 +29,8 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.ListView; +import androidx.core.view.ViewCompat; + import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocaleStore; import com.android.settings.R; @@ -105,12 +107,16 @@ public class AppLocalePickerActivity extends SettingsBaseActivity @Override public boolean onMenuItemActionCollapse(MenuItem item) { mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); + ViewCompat.setNestedScrollingEnabled(mAppLocaleDetails.getListView(), true); + ViewCompat.setNestedScrollingEnabled(mLocalePickerWithRegion.getListView(), true); return true; } @Override public boolean onMenuItemActionExpand(MenuItem item) { mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); + ViewCompat.setNestedScrollingEnabled(mAppLocaleDetails.getListView(), false); + ViewCompat.setNestedScrollingEnabled(mLocalePickerWithRegion.getListView(), false); return true; } @@ -171,4 +177,4 @@ public class AppLocalePickerActivity extends SettingsBaseActivity return false; } -} \ No newline at end of file +} From 0f3f6086e919e85292668ecf430604173f08a2cc Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 30 May 2023 15:18:28 +0800 Subject: [PATCH 5/5] Try to avoid the timing UI issue Tester exit network scan interface and then enter network scan activity immediately. The previous network scan stop command effect the current network scan. Move "stop network scan" to first at onStop. Bug: 276679520 Test: Build pass. Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0 --- .../settings/network/telephony/NetworkSelectSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index b26e7835754..ebc3ea6e226 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java @@ -228,10 +228,10 @@ public class NetworkSelectSettings extends DashboardFragment { @Override public void onStop() { - super.onStop(); if (mWaitingForNumberOfScanResults <= 0) { stopNetworkQuery(); } + super.onStop(); } @Override