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

Snap for 7838477 from 541f0e447f to sc-v2-release

Browse Source 
Change-Id: Ia1c1bb00482cada14d355fa60d23549ab3853303
This commit is contained in:
Android Build Coastguard Worker
2021-10-19 23:08:11 +00:00
parent 94cbcbcf92 541f0e447f
commit 122faced1e
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndroidManifest.xml
View File

@@ -107,8 +107,8 @@
<uses-permission android:name="android.permission.READ_DREAM_STATE" /> <uses-permission android:name="android.permission.READ_DREAM_STATE" />
<uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION" /> <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION" />
<uses-permission android:name="android.permission.MANAGE_APP_HIBERNATION" /> <uses-permission android:name="android.permission.MANAGE_APP_HIBERNATION" />
<uses-permission android:name="android.permission.LAUNCH_TWO_PANE_SETTINGS_DEEP_LINK" /> <uses-permission android:name="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK" />
<uses-permission android:name="android.permission.ALLOW_PLACE_IN_TWO_PANE_SETTINGS" /> <uses-permission android:name="android.permission.ALLOW_PLACE_IN_MULTI_PANE_SETTINGS" />
<application <application
android:name=".SettingsApplication" android:name=".SettingsApplication"
@@ -178,10 +178,10 @@
<activity-alias android:name="DeepLinkHomepageActivity" <activity-alias android:name="DeepLinkHomepageActivity"
android:label="@string/settings_label_launcher" android:label="@string/settings_label_launcher"
android:exported="true" android:exported="true"
android:permission="android.permission.LAUNCH_TWO_PANE_SETTINGS_DEEP_LINK" android:permission="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK"
android:targetActivity=".homepage.SettingsHomepageActivity"> android:targetActivity=".homepage.SettingsHomepageActivity">
<intent-filter> <intent-filter>
<action android:name="android.settings.SETTINGS_LARGE_SCREEN_DEEP_LINK" /> <action android:name="android.settings.SETTINGS_EMBED_DEEP_LINK_ACTIVITY" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>

10
src/com/android/settings/SettingsActivity.java
View File

@@ -29,6 +29,7 @@ import android.content.SharedPreferences;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.content.res.Resources.Theme; import android.content.res.Resources.Theme;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
import android.os.AsyncTask; import android.os.AsyncTask;
@@ -364,13 +365,13 @@ public class SettingsActivity extends SettingsBaseActivity
// It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it. // It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it.
final Intent trampolineIntent = final Intent trampolineIntent =
new Intent(android.provider.Settings.ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK); new Intent(android.provider.Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);
trampolineIntent.replaceExtras(intent); trampolineIntent.replaceExtras(intent);
trampolineIntent.putExtra( trampolineIntent.putExtra(
android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI, android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI,
intent.toUri(Intent.URI_INTENT_SCHEME)); intent.toUri(Intent.URI_INTENT_SCHEME));
trampolineIntent.putExtra( trampolineIntent.putExtra(
android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY, android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY,
mHighlightMenuKey); mHighlightMenuKey);
trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(trampolineIntent); startActivity(trampolineIntent);
@@ -471,6 +472,9 @@ public class SettingsActivity extends SettingsBaseActivity
return; return;
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.w(LOG_TAG, "Could not find package" + initialTitleResPackageName); Log.w(LOG_TAG, "Could not find package" + initialTitleResPackageName);
} catch (Resources.NotFoundException resourceNotFound) {
Log.w(LOG_TAG,
"Could not find title resource in " + initialTitleResPackageName);
} }
} else { } else {
setTitle(mInitialTitleResId); setTitle(mInitialTitleResId);

16
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -16,9 +16,9 @@
package com.android.settings.homepage; package com.android.settings.homepage;
import static android.provider.Settings.ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK; import static android.provider.Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY;
import static android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI; import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY;
import static android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY; import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI;
import android.animation.LayoutTransition; import android.animation.LayoutTransition;
import android.app.ActivityManager; import android.app.ActivityManager;
@@ -191,14 +191,14 @@ public class SettingsHomepageActivity extends FragmentActivity implements
final Intent intent = getIntent(); final Intent intent = getIntent();
if (intent == null || !TextUtils.equals(intent.getAction(), if (intent == null || !TextUtils.equals(intent.getAction(),
ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK)) { ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY)) {
return; return;
} }
final String intentUriString = intent.getStringExtra( final String intentUriString = intent.getStringExtra(
EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI); EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI);
if (TextUtils.isEmpty(intentUriString)) { if (TextUtils.isEmpty(intentUriString)) {
Log.e(TAG, "No EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI to deep link"); Log.e(TAG, "No EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI to deep link");
finish(); finish();
return; return;
} }
@@ -250,9 +250,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements
private String getHighlightMenuKey() { private String getHighlightMenuKey() {
final Intent intent = getIntent(); final Intent intent = getIntent();
if (intent != null && TextUtils.equals(intent.getAction(), if (intent != null && TextUtils.equals(intent.getAction(),
ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK)) { ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY)) {
final String menuKey = intent.getStringExtra( final String menuKey = intent.getStringExtra(
EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY); EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY);
if (!TextUtils.isEmpty(menuKey)) { if (!TextUtils.isEmpty(menuKey)) {
return menuKey; return menuKey;
} }

2
src/com/android/settings/notification/history/NotificationStation.java
View File

@@ -436,7 +436,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
} }
mRanking.getRanking(info.key, rank); mRanking.getRanking(info.key, rank);
info.alerted = rank.getLastAudiblyAlertedMillis() > 0; info.alerted = rank.getLastAudiblyAlertedMillis() > 0;
info.visuallyInterruptive = rank.visuallyInterruptive(); info.visuallyInterruptive = rank.isTextChanged();
info.channel = rank.getChannel(); info.channel = rank.getChannel();
info.rankingExtra = generateRankingExtraText(info); info.rankingExtra = generateRankingExtraText(info);
} }

4
tests/robotests/Android.bp
View File

@@ -60,6 +60,10 @@ android_app {
"ims-common", "ims-common",
], ],
uses_libs: ["org.apache.http.legacy"], uses_libs: ["org.apache.http.legacy"],
optional_uses_libs: [
"androidx.window.extensions",
"androidx.window.sidecar",
],
} }
//############################################################ //############################################################