PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 12148957 from 3274acfc27 to 24Q4-release

Browse Source 
Change-Id: I25c0df8aca049d92aba7412de5ad600270dd37f1
This commit is contained in:
Android Build Coastguard Worker
2024-07-27 21:21:19 +00:00
parent 35b7a6551d 3274acfc27
commit 2786b28bcc
6 changed files with 10 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/drawable/ic_pan_tool_18dp.xml
View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2019 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?android:attr/colorControlNormal">
<group>
<clip-path
android:pathData="M0,0h48v48H0z M 0,0"/>
<path
android:pathData="M46,11v29c0,4.4 -3.6,8 -8,8H23.4c-2.16,0 -4.2,-0.86 -5.7,-2.38L2,29.66s2.52,-2.46 2.6,-2.5c0.44,-0.38 0.98,-0.58 1.58,-0.58 0.44,0 0.84,0.12 1.2,0.32 0.08,0.02 8.62,4.92 8.62,4.92V8c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v14h2V3c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v19h2V5c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v17h2V11c0,-1.66 1.34,-3 3,-3s3,1.34 3,3z"
android:fillColor="#FFFFFF"/>
</group>
</vector>

137
res/layout/enable_accessibility_service_dialog_content.xml
View File

@@ -1,137 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 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.
-->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textDirection="locale"
android:scrollbarStyle="outsideOverlay"
android:gravity="top">
<LinearLayout
android:accessibilityDataSensitive="yes"
style="@style/AccessibilityDialog">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:paddingLeft="24dp"
android:paddingRight="24dp">
<ImageView
android:id="@+id/permissionDialog_icon"
style="@style/AccessibilityDialogServiceIcon" />
<TextView
android:id="@+id/permissionDialog_title"
style="@style/AccessibilityDialogTitle" />
<TextView
android:id="@+id/permissionDialog_description"
android:text="@string/accessibility_service_warning_description"
style="@style/AccessibilityDialogDescription" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="24dp" >
<ImageView
android:id="@+id/controlScreen_icon"
android:src="@drawable/ic_visibility_18dp"
style="@style/AccessibilityDialogIcon" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/controlScreen_title"
android:text="@string/accessibility_service_screen_control_title"
style="@style/AccessibilityDialogPermissionTitle" />
<TextView
android:id="@+id/controlScreen_description"
android:text="@string/accessibility_service_screen_control_description"
style="@style/AccessibilityDialogPermissionDescription" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="24dp" >
<ImageView
android:id="@+id/performAction_icon"
android:src="@drawable/ic_pan_tool_18dp"
style="@style/AccessibilityDialogIcon" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/performAction_title"
android:text="@string/accessibility_service_action_perform_title"
style="@style/AccessibilityDialogPermissionTitle" />
<TextView
android:id="@+id/performAction_description"
android:text="@string/accessibility_service_action_perform_description"
style="@style/AccessibilityDialogPermissionDescription" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- Buttons on bottom of dialog -->
<LinearLayout
style="@style/AccessibilityDialogButtonList">
<Space
style="@style/AccessibilityDialogButtonBarSpace"/>
<Button
android:id="@+id/permission_enable_allow_button"
android:text="@string/accessibility_dialog_button_allow"
style="@style/AccessibilityDialogButton" />
<Button
android:id="@+id/permission_enable_deny_button"
android:text="@string/accessibility_dialog_button_deny"
style="@style/AccessibilityDialogButton" />
<Button
android:id="@+id/permission_enable_uninstall_button"
android:text="@string/uninstall_text"
android:visibility="gone"
style="@style/AccessibilityDialogButton" />
</LinearLayout>
</LinearLayout>
</ScrollView>

1
res/raw/lottie_notification_cooldown.json Normal file
View File

File diff suppressed because one or more lines are too long

35
res/values/strings.xml
View File

@@ -5587,12 +5587,6 @@
<string name="color_magenta">Magenta</string>
<!-- Label for custom colors, formats as a HTML color. -->
<string name="color_custom" translatable="false">#%1$02X%2$02X%3$02X</string>
<!-- Title for a warning about security implications of enabling an accessibility
service. [CHAR LIMIT=NONE] -->
<string name="enable_service_title">Allow
<xliff:g id="service" example="TalkBack">%1$s</xliff:g> to have full control of your
device?</string>
<!-- Title for the list of capabilities of an accessibility service. -->
<string name="capabilities_list_title"><xliff:g id="service" example="TalkBack">%1$s</xliff:g>
needs to:</string>
@@ -5602,35 +5596,6 @@
<string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
can’t verify your response.</string>
<!-- Warning that explains that accessibility services have a lot of access to user data [CHAR LIMIT=NONE] -->
<string name="accessibility_service_warning"><xliff:g id="service"
example="TalkBack">%1$s</xliff:g> is requesting full control of this device. The service
can read the screen and act on behalf of users with accessibility needs.
This level of control is not appropriate for most apps.
</string>
<!-- Warning description that explains that it's appropriate for accessibility
services to have full control to help users with accessibility needs. [CHAR LIMIT=NONE] -->
<string name="accessibility_service_warning_description">Full control is appropriate for apps
that help you with accessibility needs, but not for most apps.
</string>
<!-- Title for the screen control in accessibility dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_service_screen_control_title">View and control screen</string>
<!-- Description for the screen control in accessibility dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_service_screen_control_description">It can read all content on the
screen and display content over other apps.
</string>
<!-- Title for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_service_action_perform_title">View and perform actions</string>
<!-- Description for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_service_action_perform_description">It can track your interactions
with an app or a hardware sensor, and interact with apps on your behalf.
</string>
<!-- String for the allow button in accessibility permission dialog. [CHAR LIMIT=10] -->
<string name="accessibility_dialog_button_allow">Allow</string>
<!-- String for the deny button in accessibility permission dialog. [CHAR LIMIT=10] -->

16
res/xml/polite_notifications_settings.xml
View File

@@ -17,20 +17,20 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/notification_polite_title">
<com.android.settingslib.widget.TopIntroPreference
android:key="polite_notification_desc"
android:title="@string/notification_polite_description"/>
<!-- TODO(b/330606963): add the illustration back when animation is ready-->
<!-- <com.android.settingslib.widget.IllustrationPreference-->
<!-- android:key="bubbles_illustration"-->
<!-- settings:searchable="false"-->
<!-- android:selectable="false"-->
<!-- app:lottie_rawRes="@raw/lottie_bubbles"-->
<!-- app:lottie_cacheComposition="false"-->
<!-- settings:dynamicColor="true" />-->
<com.android.settingslib.widget.IllustrationPreference
android:key="notification_cooldown_illustration"
settings:searchable="false"
android:selectable="false"
app:lottie_rawRes="@raw/lottie_notification_cooldown"
app:lottie_cacheComposition="false"
settings:dynamicColor="true"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="polite_notification_global_pref"

1
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -702,6 +702,7 @@ public class FingerprintSettings extends SubSettings {
if (isSfps()) {
updateFingerprintUnlockCategoryVisibility();
}
updatePreferences();
}
private void updateAddPreference() {