diff options
| -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 0961a33..78020e9 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -278,11 +278,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); } |