Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move QuickStep onboarding strings from Launcher to SysUI" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-12 19:39:39 +00:00
committed by Android (Google) Code Review
parent c5fb960b01 0ad27632ca
commit ea2e735d5b
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values/strings.xml
View File

@@ -844,6 +844,10 @@
<string name="recents_stack_action_button_label">Clear all</string>
<!-- Recents: Hint text that shows on the drop targets to start multiwindow. [CHAR LIMIT=NONE] -->
<string name="recents_drag_hint_message">Drag here to use split screen</string>
<!-- Recents: Text that shows above the navigation bar after launching a few apps. [CHAR LIMIT=NONE] -->
<string name="recents_swipe_up_onboarding">Swipe up to switch apps</string>
<!-- Recents: Text that shows above the navigation bar after launching several apps. [CHAR LIMIT=NONE] -->
<string name="recents_quick_scrub_onboarding">Drag right to quickly switch apps</string>
<!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
<string name="recents_multistack_add_stack_dialog_split_horizontal">Split Horizontal</string>

5
packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
View File

@@ -35,11 +35,6 @@ interface ISystemUiProxy {
*/
void startScreenPinning(int taskId) = 1;
/**
* Specifies the text to be shown for onboarding the new swipe-up gesture to access recents.
*/
void setRecentsOnboardingText(CharSequence text) = 3;
/**
* Enables/disables launcher/overview interaction features {@link InteractionType}.
*/

9
packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
View File

@@ -78,7 +78,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
private IOverviewProxy mOverviewProxy;
private int mConnectionBackoffAttempts;
private CharSequence mOnboardingText;
private @InteractionType int mInteractionFlags;
private boolean mIsEnabled;
@@ -119,10 +118,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
}
}
public void setRecentsOnboardingText(CharSequence text) {
mOnboardingText = text;
}
public void setInteractionState(@InteractionType int flags) {
long token = Binder.clearCallingIdentity();
try {
@@ -286,10 +281,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
return mOverviewProxy;
}
public CharSequence getOnboardingText() {
return mOnboardingText;
}
public int getInteractionFlags() {
return mInteractionFlags;
}

7
packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java
View File

@@ -227,12 +227,7 @@ public class RecentsOnboarding {
if (!shouldShow()) {
return;
}
CharSequence onboardingText = mOverviewProxyService.getOnboardingText();
if (TextUtils.isEmpty(onboardingText)) {
Log.w(TAG, "Unable to get onboarding text");
return;
}
mTextView.setText(onboardingText);
mTextView.setText(R.string.recents_swipe_up_onboarding);
// Only show in portrait.
int orientation = mContext.getResources().getConfiguration().orientation;
if (!mLayoutAttachedToWindow && orientation == Configuration.ORIENTATION_PORTRAIT) {