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

Commit 5ff35f8a authored by Aaron Whyte's avatar Aaron Whyte Committed by Android (Google) Code Review
Browse files

Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make... 

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

core/java/android/app/LauncherActivity.java

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

        mPackageManager = getPackageManager();



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

            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

            setProgressBarIndeterminateVisibility(true);

        }

        onSetContentView();



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

        updateButtonText();



        if (!mPackageManager.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

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

    }