Merge "Try to avoid the timing UI issue" into udc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5904282..db2d3b2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1707,14 +1707,14 @@
android:value="@string/menu_key_apps"/>
</activity-alias>
- <activity-alias android:name="com.google.android.settings.ManageFullScreenIntent"
+ <activity-alias android:name="ManageFullScreenIntent"
android:exported="true"
android:targetActivity=".spa.SpaBridgeActivity">
<meta-data android:name="com.android.settings.spa.DESTINATION"
android:value="TogglePermissionAppList/UseFullScreenIntent"/>
</activity-alias>
- <activity-alias android:name="com.google.android.settings.AppManageFullScreenIntent"
+ <activity-alias android:name="AppManageFullScreenIntent"
android:exported="true"
android:targetActivity=".spa.SpaAppBridgeActivity">
<intent-filter>
diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 9efaf63..092207b 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -29,6 +29,8 @@
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 @@
@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 @@
return false;
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java
index f609698..7d88821 100644
--- a/src/com/android/settings/network/MobileNetworkRepository.java
+++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -433,7 +433,6 @@
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 1474836..f924636 100644
--- a/src/com/android/settings/network/MobileNetworkSummaryController.java
+++ b/src/com/android/settings/network/MobileNetworkSummaryController.java
@@ -134,7 +134,6 @@
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(", "));
}