From d5f010e4e7fdcd6ba3959f1e148d9b4dad057017 Mon Sep 17 00:00:00 2001
From: Aaron Whyte <awhyte@google.com>
Date: Tue, 13 May 2014 02:19:10 +0000
Subject: [PATCH] Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for
 clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"

This reverts commit 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b.

Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
---
 core/java/android/app/LauncherActivity.java          | 12 ++++--------
 .../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 5657aadea2005..96c7246acf3cd 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 0961a33980e78..78020e99ca68d 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);
     }