From 1fb617fecd68c69f510164fc42aba0bc38c2cf66 Mon Sep 17 00:00:00 2001
From: Aaron Whyte <awhyte@google.com>
Date: Mon, 12 May 2014 22:08:53 -0700
Subject: Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make
 LauncherActivity CTS tests pass on clockwork. Bug: 14657859

Change-Id: I342eea5afafd56bed9b4138b97c2e906a10d300d
---
 core/java/android/app/LauncherActivity.java                  | 12 ++++++++----
 policy/src/com/android/internal/policy/impl/PhoneWindow.java |  6 ++++++
 2 files changed, 14 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() {
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 78020e99ca68..c670b5c38d53 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -43,6 +43,7 @@ import com.android.internal.widget.SwipeDismissLayout;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -278,6 +279,11 @@ 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);
     }
 
-- 
cgit v1.2.3-59-g8ed1b