diff options
author | Craig Mautner <cmautner@google.com> | 2015-04-28 16:21:06 -0700 |
---|---|---|
committer | Craig Mautner <cmautner@google.com> | 2015-05-12 10:26:13 -0700 |
commit | 61e1e09a2b6471defa1032a44a20090618c21d3f (patch) | |
tree | e599662f77773f82f4327af20b132f5db4e5ad6f /tests/LockTaskTests | |
parent | eeb60bc7bbba2eed29d78dcc56ec1760655c5481 (diff) | |
download | frameworks_base-61e1e09a2b6471defa1032a44a20090618c21d3f.zip frameworks_base-61e1e09a2b6471defa1032a44a20090618c21d3f.tar.gz frameworks_base-61e1e09a2b6471defa1032a44a20090618c21d3f.tar.bz2 |
Change attribute values per API council.
lockTaskModeDefault => default
lockTaskModeNever => never
lockTaskModeIfWhitelisted => if_whitelisted
lockTaskModeAlways => always
Fixes bug 20642190.
Change-Id: I29cc546e12c330df9ec9af3cc91faf0d0f3df3b4
Diffstat (limited to 'tests/LockTaskTests')
-rw-r--r-- | tests/LockTaskTests/AndroidManifest.xml | 8 | ||||
-rw-r--r-- | tests/LockTaskTests/res/values/strings.xml | 9 | ||||
-rw-r--r-- | tests/LockTaskTests/src/com/google/android/example/locktasktests/MainActivity.java | 34 |
3 files changed, 38 insertions, 13 deletions
diff --git a/tests/LockTaskTests/AndroidManifest.xml b/tests/LockTaskTests/AndroidManifest.xml index f88744e..e349c92 100644 --- a/tests/LockTaskTests/AndroidManifest.xml +++ b/tests/LockTaskTests/AndroidManifest.xml @@ -29,28 +29,28 @@ android:label="@string/title_activity_default" android:taskAffinity="" android:documentLaunchMode="always" - android:lockTaskMode="lockTaskModeDefault" > + android:lockTaskMode="normal" > </activity> <activity android:name="com.google.android.example.locktasktests.LockTaskNeverActivity" android:label="@string/title_activity_never" android:taskAffinity="" android:documentLaunchMode="always" - android:lockTaskMode="lockTaskModeNever" > + android:lockTaskMode="never" > </activity> <activity android:name="com.google.android.example.locktasktests.LockWhitelistedActivity" android:label="@string/title_activity_whitelist" android:taskAffinity="" android:documentLaunchMode="always" - android:lockTaskMode="lockTaskModeIfWhitelisted" > + android:lockTaskMode="if_whitelisted" > </activity> <activity android:name="com.google.android.example.locktasktests.LockAtLaunchActivity" android:label="@string/title_activity_always" android:taskAffinity="" android:documentLaunchMode="always" - android:lockTaskMode="lockTaskModeAlways" > + android:lockTaskMode="always" > </activity> </application> diff --git a/tests/LockTaskTests/res/values/strings.xml b/tests/LockTaskTests/res/values/strings.xml index 61c029f..3bcae80 100644 --- a/tests/LockTaskTests/res/values/strings.xml +++ b/tests/LockTaskTests/res/values/strings.xml @@ -7,16 +7,17 @@ <string name="title_activity_whitelist">LockWhitelistedActivity</string> <string name="title_activity_always">LockAtLaunchActivity</string> <string name="launch_default">android:lockTaskMode=\n - \"lockTaskModeDefault\"\n + \"default\"\n Pinnable from Overview.</string> <string name="launch_never">android:lockTaskMode=\n - \"lockTaskModeNever\"\n + \"never\"\n Not Lockable or Pinnable.</string> - <string name="launch_whitelist">android:lockTaskMode=\n\"lockTaskModeIfWhitelisted\"\n + <string name="launch_whitelist">android:lockTaskMode=\n + \"if_whitelisted\"\n Lockable if whitelisted, Pinnable.\n Use SampleDeviceOwner app to set whitelist.</string> <string name="launch_always">android:lockTaskMode=\n - \"lockTaskModeAlways\"\n + \"always\"\n Launches into lock mode.</string> <string name="launch_main">launch MainActivity (as activity)"</string> <string name="try_lock">Call startLockMode()</string> diff --git a/tests/LockTaskTests/src/com/google/android/example/locktasktests/MainActivity.java b/tests/LockTaskTests/src/com/google/android/example/locktasktests/MainActivity.java index c2275c8..3e4f8ee 100644 --- a/tests/LockTaskTests/src/com/google/android/example/locktasktests/MainActivity.java +++ b/tests/LockTaskTests/src/com/google/android/example/locktasktests/MainActivity.java @@ -6,26 +6,50 @@ import android.app.ActivityManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; import android.view.View; public class MainActivity extends Activity { private final static String TAG = "LockTaskTests"; + Runnable mBackgroundPolling; + boolean mRunning; + Handler mHandler; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + mBackgroundPolling = new Runnable() { + // Poll lock task state and set background pink if locked, otherwise white. + @Override + public void run() { + if (!mRunning) { + return; + } + ActivityManager activityManager = + (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); + final int color = activityManager.getLockTaskModeState() != + ActivityManager.LOCK_TASK_MODE_NONE ? 0xFFFFC0C0 : 0xFFFFFFFF; + findViewById(R.id.root_launch).setBackgroundColor(color); + mHandler.postDelayed(this, 500); + } + }; + mHandler = new Handler(Looper.getMainLooper()); } @Override public void onResume() { super.onResume(); - ActivityManager activityManager = - (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); - final int color = activityManager.getLockTaskModeState() != - ActivityManager.LOCK_TASK_MODE_NONE ? 0xFFFFC0C0 : 0xFFFFFFFF; - findViewById(R.id.root_launch).setBackgroundColor(color); + mRunning = true; + mBackgroundPolling.run(); + } + + @Override + public void onPause() { + super.onPause(); + mRunning = false; } public void onButtonPressed(View v) { |