summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-06-04 21:53:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-04 21:53:17 +0000
commit3407c254991073840c9171dcf83388d7f8d1cc39 (patch)
treeea36a074ca702ce44d9bada037f8f719a6776b75 /packages
parent27f78dc7f2314ee83fd5fcc519d3aac64d592b11 (diff)
parentfc01a6687ba6e51a40bf448cf33367d1f1216544 (diff)
downloadframeworks_base-3407c254991073840c9171dcf83388d7f8d1cc39.zip
frameworks_base-3407c254991073840c9171dcf83388d7f8d1cc39.tar.gz
frameworks_base-3407c254991073840c9171dcf83388d7f8d1cc39.tar.bz2
am fc01a668: am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
* commit 'fc01a6687ba6e51a40bf448cf33367d1f1216544': Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/DessertCaseView.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/DessertCaseView.java b/packages/SystemUI/src/com/android/systemui/DessertCaseView.java
index 4147155..14392b4 100644
--- a/packages/SystemUI/src/com/android/systemui/DessertCaseView.java
+++ b/packages/SystemUI/src/com/android/systemui/DessertCaseView.java
@@ -507,7 +507,6 @@ public class DessertCaseView extends FrameLayout {
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
);
}