summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-04-15 01:18:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-15 01:18:36 +0000
commit47dea3b16ddfc536fb68a59fda7dfeef71b886f1 (patch)
tree8199d1c6389ae414f92bb8ae6b33357d68a1b3ff
parentaaeb51233145762bdb418b3584fc6d4df9a09c8e (diff)
parent5e8ecb0f3404c3074a6077e972eb88f10a441df9 (diff)
Merge "Reduce effect on PipMenuActivity during animation" into oc-dev
-rw-r--r--packages/SystemUI/res/values/styles_tv.xml1
-rw-r--r--packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/styles_tv.xml b/packages/SystemUI/res/values/styles_tv.xml
index 3f0caab23ab4..0c4fd23ca107 100644
--- a/packages/SystemUI/res/values/styles_tv.xml
+++ b/packages/SystemUI/res/values/styles_tv.xml
@@ -21,5 +21,6 @@
<style name="PipTheme" parent="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:backgroundDimEnabled">false</item>
+ <item name="android:windowDisablePreview">true</item>
</style>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
index 9c4f16b808ab..ac0670348af2 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -195,6 +195,7 @@ public class PipMenuActivity extends Activity {
updateFromIntent(getIntent());
setTitle(R.string.pip_menu_title);
+ setDisablePreviewScreenshots(true);
}
@Override