Skip to content

Commit 2bef1f3

Browse files
author
Ricky Wai
committed
Add locknow API in TestDPC
Bug: 27490667 Change-Id: Ic1fb0141f1e0dceca8100e0a8d6ab77b55869156
1 parent 26e8f96 commit 2bef1f3

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ public class PolicyManagementFragment extends PreferenceFragment implements
235235
private static final String REQUEST_BUGREPORT_KEY = "request_bugreport";
236236
private static final String REQUEST_PROCESS_LOGS = "request_process_logs";
237237
private static final String RESET_PASSWORD_KEY = "reset_password";
238+
private static final String LOCK_NOW_KEY = "lock_now";
238239
private static final String SET_ACCESSIBILITY_SERVICES_KEY = "set_accessibility_services";
239240
private static final String SET_ALWAYS_ON_VPN_KEY = "set_always_on_vpn";
240241
private static final String SET_AUTO_TIME_REQUIRED_KEY = "set_auto_time_required";
@@ -371,6 +372,7 @@ public void onCreate(Bundle savedInstanceState) {
371372
findPreference(LOCK_SCREEN_POLICY_KEY).setOnPreferenceClickListener(this);
372373
findPreference(PASSWORD_CONSTRAINTS_KEY).setOnPreferenceClickListener(this);
373374
findPreference(RESET_PASSWORD_KEY).setOnPreferenceClickListener(this);
375+
findPreference(LOCK_NOW_KEY).setOnPreferenceClickListener(this);
374376
findPreference(SYSTEM_UPDATE_POLICY_KEY).setOnPreferenceClickListener(this);
375377
findPreference(SET_ALWAYS_ON_VPN_KEY).setOnPreferenceClickListener(this);
376378
findPreference(NETWORK_STATS_KEY).setOnPreferenceClickListener(this);
@@ -478,6 +480,9 @@ public void onPositiveButtonClicked(String[] lockTaskArray) {
478480
case RESET_PASSWORD_KEY:
479481
showResetPasswordPrompt();
480482
return false;
483+
case LOCK_NOW_KEY:
484+
mDevicePolicyManager.lockNow();
485+
return true;
481486
case START_LOCK_TASK:
482487
getActivity().startLockTask();
483488
return true;

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,8 @@
570570
<string name="password_reset_success">Password has been reset</string>
571571
<string name="password_reset_failed">Failed to reset password</string>
572572

573+
<string name="lock_now">Lock now</string>
574+
573575
<!-- Strings for managing Settings -->
574576
<string name="settings_management_title">Settings management</string>
575577
<string name="stay_on_while_plugged_in">Keep the device on while plugged in</string>

app/src/main/res/xml/device_policy_header.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@
159159
android:title="@string/reset_password"
160160
android:dialogTitle="@string/reset_password"
161161
android:inputType="textPassword" />
162+
<Preference
163+
android:key="lock_now"
164+
android:title="@string/lock_now"/>
162165
</PreferenceCategory>
163166

164167
<PreferenceCategory

0 commit comments

Comments
 (0)