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

Merge "Update quick scrub tip according to the latest mock." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-29 20:26:23 +00:00
committed by Android (Google) Code Review
parent 908610fd74 54974453ec
commit d7a053448b
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -867,6 +867,8 @@
<!-- The size of corner radius of the arrow in the onboarding toast. -->
<dimen name="recents_onboarding_toast_arrow_corner_radius">2dp</dimen>
<!-- The start margin of quick scrub onboarding toast. -->
<dimen name="recents_quick_scrub_onboarding_margin_start">8dp</dimen>
<!-- The min alpha to apply to a task affiliation group color. -->
<item name="recents_task_affiliation_color_min_alpha_percentage" format="float" type="dimen">0.6</item>

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

@@ -393,7 +393,20 @@ public class RecentsOnboarding {
if (!mLayoutAttachedToWindow && orientation == Configuration.ORIENTATION_PORTRAIT) {
mLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
mWindowManager.addView(mLayout, getWindowLayoutParams());
final int gravity;
final int x;
if (stringRes == R.string.recents_swipe_up_onboarding) {
gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
x = 0;
} else {
int layoutDirection =
mContext.getResources().getConfiguration().getLayoutDirection();
gravity = Gravity.BOTTOM | (layoutDirection == View.LAYOUT_DIRECTION_LTR
? Gravity.LEFT : Gravity.RIGHT);
x = mContext.getResources().getDimensionPixelSize(
R.dimen.recents_quick_scrub_onboarding_margin_start);
}
mWindowManager.addView(mLayout, getWindowLayoutParams(gravity, x));
mLayout.setAlpha(0);
mLayout.animate()
.alpha(1f)
@@ -459,19 +472,19 @@ public class RecentsOnboarding {
pw.println(" }");
}
private WindowManager.LayoutParams getWindowLayoutParams() {
private WindowManager.LayoutParams getWindowLayoutParams(int gravity, int x) {
int flags = WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT,
0, -mNavBarHeight / 2,
ViewGroup.LayoutParams.WRAP_CONTENT,
x, -mNavBarHeight / 2,
WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
flags,
PixelFormat.TRANSLUCENT);
lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
lp.setTitle("RecentsOnboarding");
lp.gravity = Gravity.BOTTOM;
lp.gravity = gravity;
return lp;
}