drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev

Browse Source
This commit is contained in:
Aaron Whyte
2014-05-13 20:32:21 +00:00
committed by Android (Google) Code Review
parent e95500878c 1fb617fecd
commit 5ff35f8a7f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/LauncherActivity.java
View File

@ -340,9 +340,11 @@ public abstract class LauncherActivity extends ListActivity {
super.onCreate(icicle); super.onCreate(icicle);
mPackageManager = getPackageManager(); mPackageManager = getPackageManager();
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
setProgressBarIndeterminateVisibility(true); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setProgressBarIndeterminateVisibility(true);
}
onSetContentView(); onSetContentView();
mIconResizer = new IconResizer(); mIconResizer = new IconResizer();
@ -357,7 +359,9 @@ public abstract class LauncherActivity extends ListActivity {
updateAlertTitle(); updateAlertTitle();
updateButtonText(); updateButtonText();
setProgressBarIndeterminateVisibility(false); if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
setProgressBarIndeterminateVisibility(false);
}
} }
private void updateAlertTitle() { private void updateAlertTitle() {

6
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@ -43,6 +43,7 @@ import com.android.internal.widget.SwipeDismissLayout;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
@ -278,6 +279,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
throw new AndroidRuntimeException( throw new AndroidRuntimeException(
"You cannot combine swipe dismissal and the action bar."); "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); return super.requestFeature(featureId);
} }