Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "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 02:24:13 +00:00
committed by Android (Google) Code Review
parent 5a84ec179b d5f010e4e7
commit 6af2ef8e25
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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() {

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

@@ -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);
}