summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-09-26 15:29:57 -0700
committerMichael Jurka <mikejurka@google.com>2013-10-01 11:56:43 -0700
commit7267fa58693549894999db17359ce26f8bc7b4a7 (patch)
tree55f38a256e92c26119d3323badddf31605819390 /src/com/android/launcher3/Launcher.java
parente269ca4298eb4be7c4e07bfb67cfb7dcf38c274f (diff)
downloadandroid_packages_apps_Trebuchet-7267fa58693549894999db17359ce26f8bc7b4a7.tar.gz
android_packages_apps_Trebuchet-7267fa58693549894999db17359ce26f8bc7b4a7.tar.bz2
android_packages_apps_Trebuchet-7267fa58693549894999db17359ce26f8bc7b4a7.zip
Make some changes for transparent system bars
-Move transparent bars from just GEL to Launcher3 -When wallpaper strip animates, render it under the nav bar -Disable rotation of wallpaper picker on phones Bug: 10814785 Bug: 10852650 Bug: 10852554 Change-Id: I9efeccbc4ad1933689266a5dede201ccfd34acf4
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java35
1 files changed, 7 insertions, 28 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7ae429dae..c131aac47 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -88,7 +88,6 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.view.inputmethod.InputMethodManager;
import android.widget.Advanceable;
@@ -103,12 +102,9 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileDescriptor;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.util.ArrayList;
@@ -330,6 +326,8 @@ public class Launcher extends Activity
private BubbleTextView mWaitingForResume;
+ protected TransparentBars mTransparentBars;
+
private HideFromAccessibilityHelper mHideFromAccessibilityHelper
= new HideFromAccessibilityHelper();
@@ -344,7 +342,7 @@ public class Launcher extends Activity
private static ArrayList<PendingAddArguments> sPendingAddList
= new ArrayList<PendingAddArguments>();
- private static boolean sForceEnableRotation = isPropertyEnabled(FORCE_ENABLE_ROTATION_PROPERTY);
+ public static boolean sForceEnableRotation = isPropertyEnabled(FORCE_ENABLE_ROTATION_PROPERTY);
private static class PendingAddArguments {
int requestCode;
@@ -425,6 +423,10 @@ public class Launcher extends Activity
checkForLocaleChange();
setContentView(R.layout.launcher);
+
+ mTransparentBars = new TransparentBars(findViewById(R.id.launcher));
+ mTransparentBars.requestTransparentBars(true);
+
setupViews();
grid.layout(this);
@@ -2851,8 +2853,6 @@ public class Launcher extends Activity
mStateAnimation.play(alphaAnim).after(startDelay);
mStateAnimation.addListener(new AnimatorListenerAdapter() {
- boolean animationCancelled = false;
-
@Override
public void onAnimationStart(Animator animation) {
// Prepare the position
@@ -2871,11 +2871,6 @@ public class Launcher extends Activity
mSearchDropTargetBar.hideSearchBar(false);
}
}
-
- @Override
- public void onAnimationCancel(Animator animation) {
- animationCancelled = true;
- }
});
if (workspaceAnim != null) {
@@ -3625,22 +3620,6 @@ public class Launcher extends Activity
return show;
}
- private boolean emailSent() {
- String spKey = LauncherAppState.getSharedPreferencesKey();
- SharedPreferences sp = getSharedPreferences(spKey, Context.MODE_PRIVATE);
- boolean show = sp.getBoolean(CORRUPTION_EMAIL_SENT_KEY, false);
- return show;
- }
-
- private void setEmailSent(boolean sent) {
- String spKey = LauncherAppState.getSharedPreferencesKey();
- SharedPreferences sp = getSharedPreferences(spKey, Context.MODE_PRIVATE);
-
- SharedPreferences.Editor editor = sp.edit();
- editor.putBoolean(CORRUPTION_EMAIL_SENT_KEY, sent);
- editor.commit();
- }
-
private void toggleShowWeightWatcher() {
String spKey = LauncherAppState.getSharedPreferencesKey();
SharedPreferences sp = getSharedPreferences(spKey, Context.MODE_PRIVATE);