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

Merge "Add nullchecks to ScreenPinningRequest." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-23 03:13:03 +00:00
committed by Android (Google) Code Review
parent cf893ac40c 926c56f060
commit c8303adb47
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
View File

@@ -217,7 +217,8 @@ public class ScreenPinningRequest implements View.OnClickListener {
mLayout.findViewById(R.id.screen_pinning_text_area)
.setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
View buttons = mLayout.findViewById(R.id.screen_pinning_buttons);
if (Recents.getSystemServices().hasSoftNavigationBar()) {
if (Recents.getSystemServices() != null &&
Recents.getSystemServices().hasSoftNavigationBar()) {
buttons.setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
swapChildrenIfRtlAndVertical(buttons);
} else {
@@ -235,7 +236,8 @@ public class ScreenPinningRequest implements View.OnClickListener {
}
StatusBar statusBar = SysUiServiceProvider.getComponent(mContext, StatusBar.class);
NavigationBarView navigationBarView = statusBar.getNavigationBarView();
NavigationBarView navigationBarView =
statusBar != null ? statusBar.getNavigationBarView() : null;
final boolean recentsVisible = navigationBarView != null
&& navigationBarView.isRecentsButtonVisible();
boolean touchExplorationEnabled = mAccessibilityService.isTouchExplorationEnabled();
@@ -256,10 +258,12 @@ public class ScreenPinningRequest implements View.OnClickListener {
: R.string.screen_pinning_description_recents_invisible;
}
((ImageView) mLayout.findViewById(R.id.screen_pinning_back_icon))
.setImageDrawable(navigationBarView.getBackDrawable(mContext));
((ImageView) mLayout.findViewById(R.id.screen_pinning_home_icon))
.setImageDrawable(navigationBarView.getHomeDrawable(mContext));
if (navigationBarView != null) {
((ImageView) mLayout.findViewById(R.id.screen_pinning_back_icon))
.setImageDrawable(navigationBarView.getBackDrawable(mContext));
((ImageView) mLayout.findViewById(R.id.screen_pinning_home_icon))
.setImageDrawable(navigationBarView.getHomeDrawable(mContext));
}
((TextView) mLayout.findViewById(R.id.screen_pinning_description))
.setText(descriptionStringResId);

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenPinningNotify.java
View File

@@ -42,17 +42,17 @@ public class ScreenPinningNotify {
}
/** Show "Screen pinned" toast. */
void showPinningStartToast() {
public void showPinningStartToast() {
makeAllUserToastAndShow(R.string.screen_pinning_start);
}
/** Show "Screen unpinned" toast. */
void showPinningExitToast() {
public void showPinningExitToast() {
makeAllUserToastAndShow(R.string.screen_pinning_exit);
}
/** Show a toast that describes the gesture the user should use to escape pinned mode. */
void showEscapeToast(boolean isRecentsButtonVisible) {
public void showEscapeToast(boolean isRecentsButtonVisible) {
long showToastTime = SystemClock.elapsedRealtime();
if ((showToastTime - mLastShowToastTime) < SHOW_TOAST_MINIMUM_INTERVAL) {
Slog.i(TAG, "Ignore toast since it is requested in very short interval.");