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