diff options
author | Craig Mautner <cmautner@google.com> | 2015-04-15 09:45:42 -0700 |
---|---|---|
committer | Craig Mautner <cmautner@google.com> | 2015-04-21 10:11:12 -0700 |
commit | c21ae9ed221912b61306e075d3f22726ac04013c (patch) | |
tree | 13584199534e3148ceceb7cdae210fe1c4d598b6 /tests/LockTaskTests | |
parent | 8ce568e756c4096002d2bfb786114aac5a06e54e (diff) | |
download | frameworks_base-c21ae9ed221912b61306e075d3f22726ac04013c.zip frameworks_base-c21ae9ed221912b61306e075d3f22726ac04013c.tar.gz frameworks_base-c21ae9ed221912b61306e075d3f22726ac04013c.tar.bz2 |
Add API for putting up locktask pinning toast.
Fixes bug 18993662.
Change-Id: Ic1753285044857f8ea897784485fd1a9580acf25
Diffstat (limited to 'tests/LockTaskTests')
4 files changed, 44 insertions, 26 deletions
diff --git a/tests/LockTaskTests/res/layout/activity_main.xml b/tests/LockTaskTests/res/layout/activity_main.xml index c2e93c4..dbdc9fa 100644 --- a/tests/LockTaskTests/res/layout/activity_main.xml +++ b/tests/LockTaskTests/res/layout/activity_main.xml @@ -2,7 +2,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root_launch" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin" android:paddingLeft="@dimen/activity_horizontal_margin" @@ -37,5 +37,11 @@ android:layout_marginTop="16dp" android:onClick="onButtonPressed" android:text="@string/launch_always" /> - + <Button + android:id="@+id/toast_pinned" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:onClick="onToast" + android:text="@string/toast_pinned" /> </LinearLayout> diff --git a/tests/LockTaskTests/res/values/strings.xml b/tests/LockTaskTests/res/values/strings.xml index ae7768e..61c029f 100644 --- a/tests/LockTaskTests/res/values/strings.xml +++ b/tests/LockTaskTests/res/values/strings.xml @@ -22,4 +22,5 @@ <string name="try_lock">Call startLockMode()</string> <string name="try_unlock">Call stopLockMode()</string> + <string name="toast_pinned">Show pinned toast message</string> </resources> diff --git a/tests/LockTaskTests/src/com/google/android/example/locktasktests/LaunchActivity.java b/tests/LockTaskTests/src/com/google/android/example/locktasktests/LaunchActivity.java index 1fc53cb..ab60d485 100644 --- a/tests/LockTaskTests/src/com/google/android/example/locktasktests/LaunchActivity.java +++ b/tests/LockTaskTests/src/com/google/android/example/locktasktests/LaunchActivity.java @@ -21,47 +21,61 @@ 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; import android.widget.EditText; public class LaunchActivity extends Activity { - EditText mEditText; + Runnable mBackgroundPolling; + boolean mRunning; + Handler mHandler; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_launch); - setBackgroundOnLockTaskMode(); + mBackgroundPolling = new Runnable() { + @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, 1000); + } + }; + mHandler = new Handler(Looper.getMainLooper()); } @Override public void onResume() { super.onResume(); - setBackgroundOnLockTaskMode(); + mRunning = true; + mBackgroundPolling.run(); + } + + @Override + public void onPause() { + super.onPause(); + mRunning = false; } public void onTryLock(View view) { startLockTask(); - setBackgroundOnLockTaskMode(); } public void onTryUnlock(View view) { stopLockTask(); - setBackgroundOnLockTaskMode(); } public void onLaunchMain(View view) { Intent intent = new Intent(this, MainActivity.class); startActivity(intent); } - - private void setBackgroundOnLockTaskMode() { - 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); - } } 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 82fac03..c2275c8 100644 --- a/tests/LockTaskTests/src/com/google/android/example/locktasktests/MainActivity.java +++ b/tests/LockTaskTests/src/com/google/android/example/locktasktests/MainActivity.java @@ -6,7 +6,6 @@ import android.app.ActivityManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.View; public class MainActivity extends Activity { @@ -17,13 +16,16 @@ public class MainActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - setBackgroundOnLockTaskMode(); } @Override public void onResume() { super.onResume(); - setBackgroundOnLockTaskMode(); + 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); } public void onButtonPressed(View v) { @@ -47,12 +49,7 @@ public class MainActivity extends Activity { startActivity(intent); } - private void setBackgroundOnLockTaskMode() { - 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); + public void onToast(View v) { + showLockTaskEscapeMessage(); } } |