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

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

Browse Source 
* commit 'e32bb6c9c6c27fc8d9df513994d996ceb1f226f4':
  Only show the BeanFlinger screensaver to the worthy.
This commit is contained in:
Daniel Sandler
2012-09-04 12:32:08 -07:00
committed by Android Git Automerger
parent 5154762443 e32bb6c9c6
commit f121821772
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/AndroidManifest.xml
View File

@@ -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" />

3
packages/SystemUI/res/values/strings.xml
View File

@@ -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>

7
packages/SystemUI/src/com/android/systemui/BeanBag.java
View File

@@ -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