diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-05-13 02:19:10 +0000 |
|---|---|---|
| committer | Aaron Whyte <awhyte@google.com> | 2014-05-13 02:19:10 +0000 |
| commit | d5f010e4e7fdcd6ba3959f1e148d9b4dad057017 (patch) | |
| tree | fae6a62888dca75c6ad7213fef87c22c97966b11 /core/java/android/app/LauncherActivity.java | |
| parent | 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b (diff) | |
Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
This reverts commit 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b.
Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
Diffstat (limited to 'core/java/android/app/LauncherActivity.java')
| -rw-r--r-- | core/java/android/app/LauncherActivity.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/core/java/android/app/LauncherActivity.java b/core/java/android/app/LauncherActivity.java index 5657aadea200..96c7246acf3c 100644 --- a/core/java/android/app/LauncherActivity.java +++ b/core/java/android/app/LauncherActivity.java @@ -340,11 +340,9 @@ public abstract class LauncherActivity extends ListActivity { super.onCreate(icicle); mPackageManager = getPackageManager(); - - if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - setProgressBarIndeterminateVisibility(true); - } + + requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); + setProgressBarIndeterminateVisibility(true); onSetContentView(); mIconResizer = new IconResizer(); @@ -359,9 +357,7 @@ public abstract class LauncherActivity extends ListActivity { updateAlertTitle(); updateButtonText(); - if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { - setProgressBarIndeterminateVisibility(false); - } + setProgressBarIndeterminateVisibility(false); } private void updateAlertTitle() { |