summaryrefslogtreecommitdiffstats
path: root/go
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-05-09 01:21:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-09 01:21:19 +0000
commit75d2bcbe41bb3a671bfba2cacb72455247053f17 (patch)
tree2e3f65b3a52c8c6db65a3f23dd6ef2df04950f2a /go
parent8c61598243dfa756ae1e3a0abb1a4feb02f046eb (diff)
parentfe634af0c4e0981d9e3d15bd87433601a742634b (diff)
downloadandroid_packages_apps_Trebuchet-75d2bcbe41bb3a671bfba2cacb72455247053f17.tar.gz
android_packages_apps_Trebuchet-75d2bcbe41bb3a671bfba2cacb72455247053f17.tar.bz2
android_packages_apps_Trebuchet-75d2bcbe41bb3a671bfba2cacb72455247053f17.zip
Merge "Apply insets correctly to fallback Recents Go" into ub-launcher3-qt-dev
Diffstat (limited to 'go')
-rw-r--r--go/quickstep/src/com/android/quickstep/RecentsActivity.java2
-rw-r--r--go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java21
2 files changed, 22 insertions, 1 deletions
diff --git a/go/quickstep/src/com/android/quickstep/RecentsActivity.java b/go/quickstep/src/com/android/quickstep/RecentsActivity.java
index 9fb80679e..078f3a5ff 100644
--- a/go/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/go/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -42,7 +42,7 @@ public final class RecentsActivity extends BaseRecentsActivity {
@Override
protected void reapplyUi() {
- //TODO: Implement this depending on how insets will affect the view.
+ // No-op. Insets are automatically re-applied in the root view.
}
@Override
diff --git a/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java b/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
index c0ebcb5a4..b550011f5 100644
--- a/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
+++ b/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
@@ -16,7 +16,10 @@
package com.android.quickstep.fallback;
import android.content.Context;
+import android.graphics.Insets;
+import android.graphics.Rect;
import android.util.AttributeSet;
+import android.view.WindowInsets;
import com.android.launcher3.util.TouchController;
import com.android.launcher3.views.BaseDragLayer;
@@ -30,5 +33,23 @@ public final class GoRecentsActivityRootView extends BaseDragLayer<RecentsActivi
super(context, attrs, 1 /* alphaChannelCount */);
// Go leaves touch control to the view itself.
mControllers = new TouchController[0];
+ setSystemUiVisibility(SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ | SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+ | SYSTEM_UI_FLAG_LAYOUT_STABLE);
+ }
+
+ @Override
+ public void setInsets(Rect insets) {
+ if (insets.equals(mInsets)) {
+ return;
+ }
+ super.setInsets(insets);
+ }
+
+ @Override
+ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+ Insets sysInsets = insets.getSystemWindowInsets();
+ setInsets(new Rect(sysInsets.left, sysInsets.top, sysInsets.right, sysInsets.bottom));
+ return insets.consumeSystemWindowInsets();
}
}