PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,015 Commits 1 Branch 0 Tags
adc0b398d6931ab4dad267130aad7f21de221f1c
Commit Graph

124015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
c487d5a10c Merge "Update the wording for LE Audio" into udc-dev 2023-05-11 07:11:11 +00:00
Milton Wu
d126303343 Enable presubmit biometrics unit tests 
Enable biometrics/biometrics2/password unit tests

Bug: 281627891
Test: atest :presubmit in Settings folder
Change-Id: I2587b50b75a161c7b19f1e3430e41b98cfe6cf63
Merged-In: I2587b50b75a161c7b19f1e3430e41b98cfe6cf63
(cherry picked from commit a90536b632)
 2023-05-11 06:07:08 +00:00
TreeHugger Robot
3d886d929e Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: I0e960f28ea3818f8d9dc1200bb4087ddf668846b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:12:41 +00:00
Tom Hsu
9d3ac48f44 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I640022d4161fd17a8a01770a6a031b6551d8de76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:12:09 +00:00
TreeHugger Robot
1742524dd3 Merge "Show disable dialog box when none is selected" into udc-dev 2023-05-11 05:02:34 +00:00
SongFerngWang
f4c5c8ef5e Update the wording for LE Audio 
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass

Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
 2023-05-11 12:30:59 +08:00
Tom Hsu
5576947555 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev 2023-05-11 04:30:19 +00:00
Wesley Wang
cf1190c7cb Update battery health state intent (2/3) 
- Update the extra from overheated to longlife

Bug: 278192441
Test: make SettingsRoboTests

Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8
 2023-05-11 11:27:16 +08:00
Bill Yi
fb47fec995 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0772a2ac2db018242d86d6bfc9f4bd2841198d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 03:26:45 +00:00
ykhung
8f56114489 Record app optimization mode backup into BatteryHistoricalLog 
App optimization mode format:
https://screenshot.googleplex.com/di9DDzBfYf7ihfV

App optimization mode backup format:
https://screenshot.googleplex.com/GkVW5HrgGvmv5yh

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I60a9a76a8ffc89d625ee3f77c138a19181c81c38
 2023-05-11 10:48:47 +08:00
Bill Yi
c8c199020a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8b9494bf8edd0e1ea401b95e3bdfc558c58eb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 02:40:17 +00:00
Becca Hughes
8e9119f5ab Show disable dialog box when none is selected 
Also remove from CMPP since that will be
hidden.

Test: ondevice
Bug: 281147573
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
 2023-05-11 02:28:54 +00:00
Angela Wang
ae04daac19 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I1aaac6f95b1821c08a59cabda22f84f69bfb3051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 02:19:39 +00:00
Angela Wang
22d3116188 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev 2023-05-11 01:41:47 +00:00
Hao Dong
755a67a931 Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen. 
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
 2023-05-10 23:26:02 +00:00
Treehugger Robot
9f55b55639 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica5d5437cdc99dace7ca00e1c0828783b12ae335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:48 +00:00
Bill Yi
c4697ef5bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0eeef0f8e19e8fbc74eb49b7ea766aca3c947c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:44 +00:00
Treehugger Robot
d03c1b75de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d0475fa3f2256ba3ff5957f9e07c1abd7188ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:41 +00:00
Bill Yi
d4b8fb52c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8793f182238e5a9cf2df28964c2e07bff69569e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:22 +00:00
Treehugger Robot
57c29e30d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie39284a9d4ef0776f0d67133ed95379c11e97636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:02 +00:00
Bill Yi
0e4e07c6e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d1807ac6f91b48070e4be8225de3961b64774be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:13:44 +00:00
Treehugger Robot
1c9bf31044 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-10 21:57:58 +00:00
Treehugger Robot
bb298358c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-10 21:57:36 +00:00
Treehugger Robot
767a923ecd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-10 21:55:15 +00:00
Treehugger Robot
d28f600d0e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-10 21:55:15 +00:00
Treehugger Robot
3b7b23acb8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-10 21:55:15 +00:00
Treehugger Robot
5e8e9ace78 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I3aaa0cea9d418c73f7826b0feef609cb68a38970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 20:47:13 +00:00
Treehugger Robot
f53c4e872d Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: I154a0ea462d13c4e8733697b4288611c6bbcb972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 20:44:05 +00:00
Treehugger Robot
f6eab0c9de Merge changes I4c4d257e,I4cc4cc22 into udc-dev 
* changes:
  Warn earlier about 5 provider limit
  Fix credman provider not showing
 2023-05-10 20:00:29 +00:00
Treehugger Robot
3061bcf10a Merge "Fix change not picking up work profile" into udc-dev 2023-05-10 19:57:22 +00:00
tom hsu
0617631408 [Settings] Avoid NPE if BT device is changed by framework. 
- Do not register only one BT device for primary to avoid primary
   BT devcie change to another.
 - Register and unregister all BT devices

Bug: 280236099
Test: atest passed
Change-Id: I610144c7f8f649e40d99cf1dc7f50d1f3b80f109
 2023-05-11 02:53:19 +08:00
Becca Hughes
68470a4f27 Warn earlier about 5 provider limit 
Test: ondevice
Bug: 281616441
Change-Id: I4c4d257e1a0a6396b3948a2b50462bbef1987729
 2023-05-10 17:42:21 +00:00
Treehugger Robot
90d6926883 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: Ibbdacb724f8f9742847524543eea9cacaf61e5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:36:10 +00:00
Bill Yi
3464a64172 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee243cd4b9d5d8930d600886000e584a708b634a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:36:03 +00:00
Treehugger Robot
b8e02ef73f Merge changes from topic "tc_change_2305100725_22" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-10 17:26:27 +00:00
Becca Hughes
7a5ec88784 Fix credman provider not showing 
Test: ondevice
Bug: 281787107
Change-Id: I4cc4cc2216a7c452ee63cb742a292dadbd46714f
 2023-05-10 17:24:22 +00:00
Becca Hughes
347c165521 Fix change not picking up work profile 
Test: ondevice
Bug: 281787107
Change-Id: I676384877ce21ae1f1e6972646fc465828013c74
 2023-05-10 17:02:02 +00:00
Treehugger Robot
b7aa09caf8 Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I21b56f4f1d638c287023c44aa3241804aa428eee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 16:47:48 +00:00
Treehugger Robot
6a06cdd1bf Merge "Fix mistake in test" into udc-dev 2023-05-10 15:59:23 +00:00
TreeHugger Robot
2075dbd4c3 Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I6165748f6dd4a8a81d539e6f26904eb6e495b0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 15:23:58 +00:00
TreeHugger Robot
c0c0edd078 Merge "Fix title of no-screen-lock notification" into udc-dev 2023-05-10 14:33:36 +00:00
Bill Yi
74737aa45e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 
Blank merge reason: commit message contains skip directive

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

Change-Id: I47fbf6522118645f92ca7d0611282ae70079dac3
 2023-05-10 14:31:59 +00:00
Bill Yi
f637cc7f49 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d 
Blank merge reason: commit message contains skip directive

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

Change-Id: I24760694eb939797e648180e2578a74f008280e3
 2023-05-10 14:31:15 +00:00
Elliot Sisteron
d86c590440 Remove search entries from old pages when SC is on. 
There was already some code to guard this, but this wasn't overriding
the `isPageSearchEnabled` as well to support dynamic indexing.

Bug: 280596858
Test: manual
Change-Id: If4793d9fa2a7d68eac78258c18d04e9fb7d8fcea
 2023-05-10 13:48:03 +00:00
Jigar Thakkar
e36f5fd311 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: Ic3a653f6780fea6e7c94b50f3dedbb2e5042589c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:40:45 +00:00
Jigar Thakkar
002f06e120 Merge "Modify clone profile accounts info section" into udc-dev 2023-05-10 13:38:58 +00:00
Treehugger Robot
ef17df23e3 Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577

Change-Id: Ib4a75c0693b2a6f09ed79bc9841f8fd8324255b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 11:50:48 +00:00
Treehugger Robot
d865ccc2ed Merge "Refine optimize page log pattern" into udc-dev 2023-05-10 11:38:38 +00:00
YK Hung
a7c609e8a3 Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578

Change-Id: Ie327dc768c1b8ddfa2965e7b65053e9bf389187c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 11:28:28 +00:00
Treehugger Robot
05f97ecd76 Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005

Change-Id: Iecb665be4c15549b679aeb28ff353dc067a7190d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 11:28:18 +00:00