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

Snap for 9531300 from c0f68d56dd to udc-release

Browse Source 
Change-Id: I5fba6040ad822b3e86179d18033d9c7f3ac53fb3
This commit is contained in:
Android Build Coastguard Worker
2023-01-27 02:31:53 +00:00
parent 05a853ea70 c0f68d56dd
commit 2378dff40d
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protos/launcher_atom.proto
+3 -1
View File
@@ -130,7 +130,7 @@ message TaskBarContainer {
optional int32 cardinality = 2;
}
// Next value 41
// Next value 43
enum Attribute {
UNKNOWN = 0;
DEFAULT_LAYOUT = 1; // icon automatically placed in workspace, folder, hotseat
@@ -174,6 +174,8 @@ enum Attribute {
ALL_APPS_SEARCH_RESULT_PEOPLE_TILE = 27;
ALL_APPS_SEARCH_RESULT_LEGACY_SHORTCUT = 30;
ALL_APPS_SEARCH_RESULT_ASSISTANT_MEMORY = 31;
ALL_APPS_SEARCH_RESULT_VIDEO = 41;
ALL_APPS_SEARCH_RESULT_SYSTEM_POINTER = 42;
// Web suggestions provided by AGA
ALL_APPS_SEARCH_RESULT_WEB_SUGGEST = 39;
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+4 -2
View File
@@ -17,6 +17,7 @@
package com.android.quickstep.util;
import static android.app.ActivityTaskManager.INVALID_TASK_ID;
import static android.app.PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT;
import static android.app.PendingIntent.FLAG_MUTABLE;
import static com.android.launcher3.Utilities.postAsyncCallback;
@@ -310,8 +311,9 @@ public class SplitSelectStateController {
private PendingIntent getPendingIntent(Intent intent) {
return intent == null ? null : (mUser != null
? PendingIntent.getActivityAsUser(mContext, 0, intent,
FLAG_MUTABLE, null /* options */, mUser)
: PendingIntent.getActivity(mContext, 0, intent, FLAG_MUTABLE));
FLAG_MUTABLE | FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT, null /* options */, mUser)
: PendingIntent.getActivity(mContext, 0, intent,
FLAG_MUTABLE | FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT));
}
public @StagePosition int getActiveSplitStagePosition() {
src/com/android/launcher3/settings/SettingsActivity.java
+4 -3
View File
@@ -226,9 +226,10 @@ public class SettingsActivity extends FragmentActivity
getResources().getString(R.string.search_pref_screen_title))){
DeviceProfile mDeviceProfile = InvariantDeviceProfile.INSTANCE.get(
getContext()).getDeviceProfile(getContext());
getPreferenceScreen().setTitle(mDeviceProfile.isTablet ?
R.string.search_pref_screen_title_tablet
: R.string.search_pref_screen_title);
getPreferenceScreen().setTitle(mDeviceProfile.isMultiDisplay
|| mDeviceProfile.isPhone ?
R.string.search_pref_screen_title :
R.string.search_pref_screen_title_tablet);
}
getActivity().setTitle(getPreferenceScreen().getTitle());
}