summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-10-09 18:28:41 -0400
committerJohn Spurlock <jspurlock@google.com>2013-10-09 18:28:41 -0400
commit3442bc94672a909606a8dd001df8b1b180ddbd80 (patch)
treef8489797c9861dd491e04ab7d0d3831b30680cad /src
parent564a2e7116b026c1d73829e65d47b660b03a3c72 (diff)
downloadandroid_packages_apps_Trebuchet-3442bc94672a909606a8dd001df8b1b180ddbd80.tar.gz
android_packages_apps_Trebuchet-3442bc94672a909606a8dd001df8b1b180ddbd80.tar.bz2
android_packages_apps_Trebuchet-3442bc94672a909606a8dd001df8b1b180ddbd80.zip
Use translucent decor theme attributes in Launcher3.
And remove interim helper class. Bug:10674960 Change-Id: I81d31563074deea058b9bbb4b806c6200f85230f
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java5
-rw-r--r--src/com/android/launcher3/TranslucentDecor.java82
2 files changed, 0 insertions, 87 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5aec399b5..6af3bea9f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -328,8 +328,6 @@ public class Launcher extends Activity
private BubbleTextView mWaitingForResume;
- protected TranslucentDecor mTransparentDecor;
-
private HideFromAccessibilityHelper mHideFromAccessibilityHelper
= new HideFromAccessibilityHelper();
@@ -428,9 +426,6 @@ public class Launcher extends Activity
checkForLocaleChange();
setContentView(R.layout.launcher);
- mTransparentDecor = new TranslucentDecor(findViewById(R.id.launcher));
- mTransparentDecor.requestTranslucentDecor(true);
-
setupViews();
grid.layout(this);
diff --git a/src/com/android/launcher3/TranslucentDecor.java b/src/com/android/launcher3/TranslucentDecor.java
deleted file mode 100644
index b50c02268..000000000
--- a/src/com/android/launcher3/TranslucentDecor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3;
-
-import android.app.Activity;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-public class TranslucentDecor {
- private static final int SYSTEM_UI_FLAG_TRANSPARENT_STATUS = 0x00001000;
- private static final int SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION = 0x00002000;
-
- // Replace with SDK constants when available.
- public static final int FLAG_TRANSLUCENT_STATUS = 0x04000000;
- public static final int FLAG_TRANSLUCENT_NAVIGATION = 0x08000000;
-
- // Behave properly on early K builds.
- public static final boolean SYSUI_SUPPORTED = !hasSystemUiFlag("ALLOW_TRANSIENT") &&
- hasSystemUiFlag("TRANSPARENT_STATUS") &&
- hasSystemUiFlag("TRANSPARENT_NAVIGATION");
-
- public static final boolean WM_SUPPORTED =
- hasWindowManagerFlag("TRANSLUCENT_STATUS") &&
- hasWindowManagerFlag("TRANSLUCENT_NAVIGATION");
-
- private final View mTarget;
-
- public TranslucentDecor(View target) {
- mTarget = target;
- }
-
- public void requestTranslucentDecor(boolean translucent) {
- int sysui = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
- | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
- if (WM_SUPPORTED && mTarget.getContext() instanceof Activity) {
- Window w = ((Activity) mTarget.getContext()).getWindow();
- int wmFlags = FLAG_TRANSLUCENT_STATUS | FLAG_TRANSLUCENT_NAVIGATION;
- if (translucent) {
- w.addFlags(wmFlags);
- } else {
- w.clearFlags(wmFlags);
- }
- } else if (SYSUI_SUPPORTED) { // Remove when droidfood platform is updated
- if (translucent) {
- sysui |= SYSTEM_UI_FLAG_TRANSPARENT_STATUS | SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION;
- }
- }
- mTarget.setSystemUiVisibility(sysui);
- }
-
- private static boolean hasWindowManagerFlag(String name) {
- try {
- return WindowManager.LayoutParams.class.getField("FLAG_" + name) != null;
- } catch (NoSuchFieldException e) {
- return false;
- }
- }
-
- private static boolean hasSystemUiFlag(String name) {
- try {
- return View.class.getField("SYSTEM_UI_FLAG_" + name) != null;
- } catch (NoSuchFieldException e) {
- return false;
- }
- }
-}