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

Commit e32bb6c9 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Only show the BeanFlinger screensaver to the worthy." into jb-mr1-dev

parents b788556b 0bcf4adc

packages/SystemUI/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
            android:name=".BeanBag"

            android:exported="true"

            android:label="BeanBag"

            android:icon="@drawable/redbeandroid"

            android:icon="@drawable/redbean2"

            android:theme="@android:style/Theme.Wallpaper.NoTitleBar.Fullscreen"

            android:hardwareAccelerated="true"

            android:launchMode="singleInstance"
@@ -184,7 +184,9 @@ 
        <service

            android:name=".BeanBagDream"

            android:exported="true"

            android:label="Beans in space">

            android:label="@string/jelly_bean_dream_name"

            android:enabled="false"

            >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -397,4 +397,7 @@ 


    <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->

    <string name="accessibility_rotation_lock_on_portrait">Screen is locked in portrait orientation.</string>



    <!-- Name of the Jelly Bean platlogo screensaver -->

    <string name="jelly_bean_dream_name">BeanFlinger</string>

</resources>

packages/SystemUI/src/com/android/systemui/BeanBag.java

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.app.Activity; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.graphics.drawable.AnimationDrawable;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.Bitmap;
@@ -40,6 +41,7 @@ import android.graphics.Rect; 
import android.graphics.RectF;

import android.os.Handler;

import android.os.SystemClock;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.Pair;
@@ -402,6 +404,11 @@ public class BeanBag extends Activity { 
    public void onStart() {

        super.onStart();



        // ACHIEVEMENT UNLOCKED

        PackageManager pm = getPackageManager();

        pm.setComponentEnabledSetting(new ComponentName(this, BeanBagDream.class),

                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);



        getWindow().addFlags(

                  WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON

                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED