PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,538 Commits 1 Branch 0 Tags
dbc0fc9e55888328e4cc186c82ccde28ab04a01d
Commit Graph

110538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Behnam Heydarshahi
3ac6aaf796 Add notification volume controller in settings 
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.

For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.

Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".

Bug: b/38477228

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests

Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
 2022-10-10 14:42:56 +00:00
Bill Yi
a1ec1e30df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3af7cdfeb330c352ea352e08484cf4f8eb9d8890
 2022-10-09 20:44:05 -07:00
Bill Yi
8e5a2508d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2059426b17b50acca54064684c5d5fb52b6d96e4
 2022-10-09 20:43:13 -07:00
Bill Yi
177fea7707 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I84d0bcacb71f88a68f961d2d1cf83b8df1bdcdaf
 2022-10-09 20:42:21 -07:00
Bill Yi
3ff3434900 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4d08d5d8e1745590996ec0b940bc587bcb92eec2
 2022-10-09 20:40:28 -07:00
Bill Yi
e729683b8f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7a42785ad43d43c8185c6ba06fd40672bb674b13
 2022-10-09 20:37:39 -07:00
Bill Yi
4ba8745b10 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I95d0d47182909547a30671ac207bc59a5769db98
 2022-10-09 20:34:46 -07:00
Bill Yi
171a00478b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5080ea8ef088ac3455bd258df08e64823f5bf5b5
 2022-10-09 20:28:54 -07:00
Bill Yi
3f2f1212a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I23abdb70990b8472d4e2ee881a89df083cf064a6
 2022-10-09 20:27:40 -07:00
Bill Yi
467155435c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I30d81e9920cda4cd5d07a1f07456c37b2ac94da3
 2022-10-09 20:26:30 -07:00
Shen Lin
97a61bad7d Add fallback summary text if there is no matching screen timeout value 
Screen timeout summary string can be null if there is no matching candidate, so we need a fallback summary here to avoid showing unexpected summary text.

Bug: 252340891
Test: manual

Change-Id: I939ae97a50063b2ffe84029135c3f340aeedf4c7
 2022-10-09 01:59:02 +00:00
TreeHugger Robot
45bab9ddc4 Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc096 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050

Change-Id: I68b6a8afeb51b04b1c48cf7e4c94e6e9ff5f346e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 07:21:06 +00:00
TreeHugger Robot
0b79b2ed99 Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am: d776340d33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20075575

Change-Id: I621842329767134c1a18baafa3f125dd1ca49c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 07:20:50 +00:00
TreeHugger Robot
4fd86cc096 Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev 2022-10-08 06:54:15 +00:00
TreeHugger Robot
d776340d33 Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev 2022-10-08 06:53:35 +00:00
SongFerng Wang
97d375875a Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev am: da58404ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064005

Change-Id: Id8b05f8faaadee52922e785b6e15c40eb1dd12de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-07 14:09:58 +00:00
SongFerng Wang
da58404ea6 Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev 2022-10-07 11:04:22 +00:00
Josh Hou
c01034ebd1 [Panlingual] Separate the app locale information by profiles 
Fix not seeing apps with the LocaleConfig in the app language selector of Settings.

Bug: 239054437
Test: Manual
Change-Id: I4db78300b63e6fda2890383c097bb46102084d95
 2022-10-07 17:24:48 +08:00
Xin Li
302b01f8e2 Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 
Bug: 248070379
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
Change-Id: Ib8c6441f2165784804a1863bcfce6b05d20ecfd3
 2022-10-06 12:22:57 -07:00
Milton Wu
328be58b48 Do not show 2nd FingerprintErrorDialog 
When fingerprint enrollment is stopped because of credential timeout, it
pops a FingerprintErrorDialog, and this error dialog triggers
onWindowFocusChanged(), and the 2nd FingerprintErrorDialog is shown. To
fix this case, checking mIsCanceled flag do nothing  in
onWindowFocusChanged() method.

On the first dialog, the 'Try again' button relaunch activity with new
Intent, and it causes that activity result fails to pass back to caller.
To fix this bug, add FLAG_ACTIVITY_FORWARD_RESULT on new Intent to pass
result back.

Bug: 248165760
Test: Manually test credential timeout behavior and dialog buttons
Test: Manually test enrollment process has been cancelled for scenarios,
      like "Swipe down Notification Shade" and "Recents"
Test: robo test for FingerprintEnrollEnrollingTest
Change-Id: I4441ba026db9b594f1d6184280668a374126a2fb
 2022-10-06 15:40:51 +08:00
Alice Kuo
ba98d1839f [automerger skipped] Remove A2dp offload disabled and LE audio offload enabled combination am: 6ecbe4c18e -s ours 
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 7cc845026c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20126030

Change-Id: I53940a801940e9dc2cd189a56ef1f256a6abd75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-06 04:30:08 +00:00
Alice Kuo
6ecbe4c18e Remove A2dp offload disabled and LE audio offload enabled combination 
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
   as well

Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
(cherry picked from commit 7cc845026c)
 2022-10-06 10:35:03 +08:00
Xin Li
b59986a3f0 [automerger skipped] Merge "Merge TP1A.221005.003" am: 2af8366306 am: ec0cf19aad -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 5e785a2d99 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893

Change-Id: I68ff599414f5230a31efc34d80bdf6808c25727c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-06 00:32:43 +00:00
Xin Li
ec0cf19aad Merge "Merge TP1A.221005.003" am: 2af8366306 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893

Change-Id: Ic9f25644a305419732cb5406b96166e8708a3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 22:39:29 +00:00
Xin Li
2af8366306 Merge "Merge TP1A.221005.003" 2022-10-05 22:20:14 +00:00
Treehugger Robot
ff788fa9b9 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 am: fe38c3c91e am: bf19bf23a5 am: b969c8a4c7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I011b9815444d73b85b470db94d0bb53f5479c51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 17:54:58 +00:00
Treehugger Robot
b969c8a4c7 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 am: fe38c3c91e am: bf19bf23a5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: Ibae8540c83dbabec5cf5bfa96ddaab3219ec5b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 17:26:59 +00:00
Treehugger Robot
bf19bf23a5 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 am: fe38c3c91e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I3db9d784789e88ee04f50f040eb3741a87768640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 16:59:01 +00:00
Treehugger Robot
fe38c3c91e Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I4ecfd48d3e62eeaf01452283111d2ddaf7acb29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 16:26:25 +00:00
Treehugger Robot
bcde51cf09 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" 2022-10-05 16:04:05 +00:00
Alice Kuo
7cc845026c Remove A2dp offload disabled and LE audio offload enabled combination 
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
   as well

Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
 2022-10-04 23:48:11 +08:00
TreeHugger Robot
add2b37f3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a94259a716 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20103197

Change-Id: I10a095b1d0668e1797f12dd81acfcc7dee3ad54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 02:05:10 +00:00
Bill Yi
a4d4bc1df3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130ca8d869 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20103197

Change-Id: Ib6ded72a3def852b217e1fa160ad06a6d62e0f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 02:04:50 +00:00
Bill Yi
97410f46bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad1d5c5080 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20103196

Change-Id: I18054ae8f2f5210e7e044136154ac184c447fa47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 02:04:28 +00:00
TreeHugger Robot
a94259a716 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-04 01:45:21 +00:00
Bill Yi
130ca8d869 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic1d704580d378aceba24a558590c41bf16b97b07
 2022-10-03 13:19:00 -07:00
Xin Li
f51d201af3 Merge TP1A.221005.003 
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Change-Id: Ia7b51d3cc694287b930d240c77e5ba0ed9a527f4
 2022-10-03 13:17:48 -07:00
Bill Yi
ad1d5c5080 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I16b0a52db27e52e07af91f9a7b88796c5bbec9c8
 2022-10-03 13:16:02 -07:00
Tsung-Mao Fang
8b8d3b45f9 Guard FallbackHome activity behind permission 
An attacker can launch FallbackHome of the Settings app
to reset unlock time. This would prevent the device from
sleeping because it runs the following code:
PowerManager#userActivity().

However, running PowerManager.userActivity() requires
android.permission.DEVICE_POWER or android.permission.USER_ACTIVITY.

So, let's add a permission to guard this activity.

Test: Rebuilt a rom and see no side effect.
Bug: 246543238
Change-Id: I23a1e352f76cbec3e8c07a1b58b94615f2779121
(cherry picked from commit f5062c2df8)
 2022-10-03 06:37:46 +00:00
TreeHugger Robot
7b435b6111 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours am: 353daaa2f7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: I1ecf75b27f5ed85648f2d4dd26ccbedb8adbc399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:23:48 +00:00
Bill Yi
7a3ba54d23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 567c6dd3ca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: Ib340ffec431f5a77e5b181830192ec9516c8d8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:23:25 +00:00
TreeHugger Robot
1f0962c3c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours am: db09b990a0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: Ic00f62d2e84db365ddfcd3eb0d629c1da51f1de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:21:26 +00:00
Bill Yi
02fa63e2fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 0aca2c219d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: I81058835048aa75939c95147f0a8b71dc19584bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:21:09 +00:00
TreeHugger Robot
353daaa2f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: Ia73419f75f327782d073cefa48ad1d65a87e9b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:35 +00:00
TreeHugger Robot
db09b990a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: I91e0858307d1055b300a67ae7ba22b9897bac4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:31 +00:00
Bill Yi
567c6dd3ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: I0c47748f2ea5d2e6691937acee6c91d96bcc5122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:12 +00:00
Bill Yi
0aca2c219d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810

Change-Id: I6dd06d608b1b319d2214514a145b7c178378bbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:11 +00:00
TreeHugger Robot
5b8a3aabaa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-02 07:26:20 +00:00
Bill Lin
6b763d1999 Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179

Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-01 00:22:29 +00:00
Bill Lin
e5a4e38c8c Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev 2022-09-30 23:54:31 +00:00