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

Snap for 10225371 from a171a9d426 to udc-release

Browse Source 
Change-Id: Ifbe5058eec4b7a925d5fd3ed322b471193a2d4ac
This commit is contained in:
Android Build Coastguard Worker
2023-05-30 23:29:49 +00:00
parent 29cedce50d a171a9d426
commit 13e9e3bf1b
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -1707,14 +1707,14 @@
android:value="@string/menu_key_apps"/> android:value="@string/menu_key_apps"/>
</activity-alias> </activity-alias>
<activity-alias android:name="com.google.android.settings.ManageFullScreenIntent" <activity-alias android:name="ManageFullScreenIntent"
android:exported="true" android:exported="true"
android:targetActivity=".spa.SpaBridgeActivity"> android:targetActivity=".spa.SpaBridgeActivity">
<meta-data android:name="com.android.settings.spa.DESTINATION" <meta-data android:name="com.android.settings.spa.DESTINATION"
android:value="TogglePermissionAppList/UseFullScreenIntent"/> android:value="TogglePermissionAppList/UseFullScreenIntent"/>
</activity-alias> </activity-alias>
<activity-alias android:name="com.google.android.settings.AppManageFullScreenIntent" <activity-alias android:name="AppManageFullScreenIntent"
android:exported="true" android:exported="true"
android:targetActivity=".spa.SpaAppBridgeActivity"> android:targetActivity=".spa.SpaAppBridgeActivity">
<intent-filter> <intent-filter>

2
res/values/strings.xml
View File

@@ -7890,7 +7890,7 @@
<string name="notification_conversation_summary_low">No sound or vibration and appears lower in conversation section</string> <string name="notification_conversation_summary_low">No sound or vibration and appears lower in conversation section</string>
<!-- [CHAR LIMIT=150] Notification Importance title: normal importance level summary --> <!-- [CHAR LIMIT=150] Notification Importance title: normal importance level summary -->
<string name="notification_channel_summary_default">May ring or vibrate based on phone settings</string> <string name="notification_channel_summary_default">May ring or vibrate based on device settings</string>
<!-- [CHAR LIMIT=150] Notification Importance title: high importance level summary --> <!-- [CHAR LIMIT=150] Notification Importance title: high importance level summary -->
<string name="notification_channel_summary_high">When device is unlocked, show notifications as a banner across the top of the screen</string> <string name="notification_channel_summary_high">When device is unlocked, show notifications as a banner across the top of the screen</string>

6
src/com/android/settings/localepicker/AppLocalePickerActivity.java
View File

@@ -29,6 +29,8 @@ import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ListView; import android.widget.ListView;
import androidx.core.view.ViewCompat;
import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore; import com.android.internal.app.LocaleStore;
import com.android.settings.R; import com.android.settings.R;
@@ -105,12 +107,16 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
@Override @Override
public boolean onMenuItemActionCollapse(MenuItem item) { public boolean onMenuItemActionCollapse(MenuItem item) {
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
ViewCompat.setNestedScrollingEnabled(mAppLocaleDetails.getListView(), true);
ViewCompat.setNestedScrollingEnabled(mLocalePickerWithRegion.getListView(), true);
return true; return true;
} }
@Override @Override
public boolean onMenuItemActionExpand(MenuItem item) { public boolean onMenuItemActionExpand(MenuItem item) {
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
ViewCompat.setNestedScrollingEnabled(mAppLocaleDetails.getListView(), false);
ViewCompat.setNestedScrollingEnabled(mLocalePickerWithRegion.getListView(), false);
return true; return true;
} }

1
src/com/android/settings/network/MobileNetworkRepository.java
View File

@@ -433,7 +433,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
mActiveSubInfoEntityList = availableSubInfoEntityList.stream() mActiveSubInfoEntityList = availableSubInfoEntityList.stream()
.filter(SubscriptionInfoEntity::isActiveSubscription) .filter(SubscriptionInfoEntity::isActiveSubscription)
.filter(SubscriptionInfoEntity::isSubscriptionVisible) .filter(SubscriptionInfoEntity::isSubscriptionVisible)
.sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = " Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = "

1
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -134,7 +134,6 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
return mContext.getString(R.string.mobile_network_tap_to_activate, displayName); return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
} else { } else {
return mSubInfoEntityList.stream() return mSubInfoEntityList.stream()
.sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
.map(SubscriptionInfoEntity::getUniqueDisplayName) .map(SubscriptionInfoEntity::getUniqueDisplayName)
.collect(Collectors.joining(", ")); .collect(Collectors.joining(", "));
} }

2
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -228,10 +228,10 @@ public class NetworkSelectSettings extends DashboardFragment {
@Override @Override
public void onStop() { public void onStop() {
super.onStop();
if (mWaitingForNumberOfScanResults <= 0) { if (mWaitingForNumberOfScanResults <= 0) {
stopNetworkQuery(); stopNetworkQuery();
} }
super.onStop();
} }
@Override @Override