Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d67fd642 authored by Aaron Whyte's avatar Aaron Whyte Committed by Android Git Automerger
Browse files

am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for... 

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

* commit '6af2ef8e':
  Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
parents 30510054 6af2ef8e

core/java/android/app/LauncherActivity.java

+4 −8
Original line number Diff line number Diff line
@@ -341,10 +341,8 @@ public abstract class LauncherActivity extends ListActivity { 
        

        mPackageManager = getPackageManager();

    

        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {

        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

        setProgressBarIndeterminateVisibility(true);

        }

        onSetContentView();



        mIconResizer = new IconResizer();
@@ -359,10 +357,8 @@ public abstract class LauncherActivity extends ListActivity { 
        updateAlertTitle();

        updateButtonText();



        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {

        setProgressBarIndeterminateVisibility(false);

    }

    }



    private void updateAlertTitle() {

        TextView alertTitle = (TextView) findViewById(com.android.internal.R.id.alertTitle);

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+0 −5
Original line number Diff line number Diff line
@@ -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);

    }