diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-05-13 02:31:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 02:31:48 +0000 |
| commit | 51f110f9d704881e4362bd29b9d141cb2b2b6b02 (patch) | |
| tree | d93d98dc93b81742847f97f0c6afd005658d10de | |
| parent | 272bd8b9a370eaf1fea8da5258dbdbb97e33302e (diff) | |
| parent | d67fd6428a2bcaedca79fb96f971dd021e08a651 (diff) | |
| download | frameworks_base-51f110f9d704881e4362bd29b9d141cb2b2b6b02.zip frameworks_base-51f110f9d704881e4362bd29b9d141cb2b2b6b02.tar.gz frameworks_base-51f110f9d704881e4362bd29b9d141cb2b2b6b02.tar.bz2 | |
am d67fd642: am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
* commit 'd67fd6428a2bcaedca79fb96f971dd021e08a651':
Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
| -rw-r--r-- | core/java/android/app/LauncherActivity.java | 12 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 5 |
2 files changed, 4 insertions, 13 deletions
diff --git a/core/java/android/app/LauncherActivity.java b/core/java/android/app/LauncherActivity.java index 5657aad..96c7246 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() { diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index cd9f26f..b1fea03 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -301,11 +301,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { throw new AndroidRuntimeException( "You cannot combine swipe dismissal and the action bar."); } - - if (featureId == FEATURE_INDETERMINATE_PROGRESS && - getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { - throw new AndroidRuntimeException("You cannot use indeterminate progress on a watch."); - } return super.requestFeature(featureId); } |