diff options
author | Philip P. Moltmann <moltmann@google.com> | 2018-08-30 11:06:49 -0700 |
---|---|---|
committer | Philip P. Moltmann <moltmann@google.com> | 2018-09-13 09:56:41 -0700 |
commit | 2d21d77e78e8bd9c06ac7a2192ff90e6d75c5390 (patch) | |
tree | 04f550dc3e3ceb2761b22e3b27ca8f74dd0fb263 /packages/SettingsLib/RestrictedLockUtils | |
parent | beb077d987bed4e45a3e6ec7e3b8468ec66e1a0b (diff) |
Make restricted lock icon system-api
Bug: 110953302
Test: CtsVerifier -> BYOD Managed Provision -> Permission Lockdown (test
created a permission disabled by admin)
Change-Id: I042668225227aabc9655d83307e60f7efe399d8d
Diffstat (limited to 'packages/SettingsLib/RestrictedLockUtils')
3 files changed, 47 insertions, 0 deletions
diff --git a/packages/SettingsLib/RestrictedLockUtils/Android.bp b/packages/SettingsLib/RestrictedLockUtils/Android.bp index d4c9794bda63..b2f088257bb9 100644 --- a/packages/SettingsLib/RestrictedLockUtils/Android.bp +++ b/packages/SettingsLib/RestrictedLockUtils/Android.bp @@ -2,6 +2,7 @@ android_library { name: "SettingsLibRestrictedLockUtils", srcs: ["src/**/*.java"], + resource_dirs: ["res"], libs: [ "androidx.annotation_annotation", diff --git a/packages/SettingsLib/RestrictedLockUtils/res/layout/restricted_icon.xml b/packages/SettingsLib/RestrictedLockUtils/res/layout/restricted_icon.xml new file mode 100644 index 000000000000..0f02abd94216 --- /dev/null +++ b/packages/SettingsLib/RestrictedLockUtils/res/layout/restricted_icon.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/restricted_icon" + android:layout_width="@*android:dimen/config_restricted_icon_size" + android:layout_height="@*android:dimen/config_restricted_icon_size" + android:tint="?android:attr/colorAccent" + android:src="@*android:drawable/ic_info" /> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values/strings.xml new file mode 100644 index 000000000000..7e4460ba815d --- /dev/null +++ b/packages/SettingsLib/RestrictedLockUtils/res/values/strings.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2018 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Summary for switch preference to denote it is switched on [CHAR LIMIT=50] --> + <string name="enabled_by_admin">Enabled by admin</string> + <!-- Summary for switch preference to denote it is switched off [CHAR LIMIT=50] --> + <string name="disabled_by_admin">Disabled by admin</string> + +</resources>
\ No newline at end of file |