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

124527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a0c32784ea Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I8305321fbd714d439171437c8500f063ee01d8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 12:58:03 +00:00
Treehugger Robot
de4e33dc52 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: 8bf8d0b1eb am: c75b598d0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: Ifc2df948cf586bc8a98055f8708ded018b04babd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 12:57:59 +00:00
Jason Hsu
db3a350e4d Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: Ie46216f90ac9df4776e626885b218cf306b3dbb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 12:57:38 +00:00
Treehugger Robot
86f145d22a Merge "Avoid showing "0 minute" in the charge time label" into udc-dev 2023-05-11 12:54:55 +00:00
tom hsu
50dc4e857b Ordering the SIM display name by slot ID to the preference summary. 
Bug: 271975836
Test: Manual Test
Change-Id: Ib28062c8d0f1299cf30d494561c161fc4532dbc9
 2023-05-11 20:48:09 +08:00
Weng Su
571d9b1f37 Fix failing test case in AllInOneTetherSettingsTest 
- Add the necessary mock classes

Bug: 280067520
Test: Manual test
atest -c AllInOneTetherSettingsTest

Change-Id: I6576c6997b43103ea810008b7a1a245e3e42015c
 2023-05-11 20:43:34 +08:00
Treehugger Robot
5acc7def5e Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: cb9d74cea2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: Iaf78029f1f0c37f068c73f74e97c057c34cbe945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 12:20:21 +00:00
Treehugger Robot
d22d3ff4eb Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: 8bf8d0b1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: I51551cfb428a607d7f8a6d7ec12b69da663b053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 12:19:12 +00:00
Treehugger Robot
c75b598d0c Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: 8bf8d0b1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: Ie7a2be85d0008d7e8e09eb14468714c93e764963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 12:16:41 +00:00
Jason Hsu
f7f38b2d66 Merge "Update hearing aids to hearing devices" into udc-dev 2023-05-11 12:15:02 +00:00
Treehugger Robot
53475e1994 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf am: da48c087e0 am: 27dea53939 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: Id5d869f9c803f51d96d811c47b9e65e221e9289d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 11:38:58 +00:00
Treehugger Robot
8bf8d0b1eb Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: I019a6b64bd482cbdfc15648a1dcdfd3648708519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 11:37:52 +00:00
Treehugger Robot
7035f74645 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf am: 4d61561fa3 am: 721820de1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I89f8900cf4bf2c962a459d32dac04d5c0ad60eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 11:34:07 +00:00
Treehugger Robot
cb9d74cea2 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: Ia53318c8bf1dcd32af55934506a2ea0d15250e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 11:33:42 +00:00
Treehugger Robot
aca653cbcc Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf am: da48c087e0 am: b1f6ae7816 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: Iada775acab620bf47d99f428dcd0c6f4627f5be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 11:33:19 +00:00
ykhung
7fdd0e9ef9 Avoid showing "0 minute" in the charge time label 
Remove the charge to full time label if its value is invalid
https://screenshot.googleplex.com/5psbvFpcm2CFdRB

Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Fix: 278740808
Change-Id: I765cdcdee8525adb2583d5950bc646c604c744de
 2023-05-11 19:13:38 +08:00
Treehugger Robot
721820de1e Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf am: 4d61561fa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: If0e756eaadbc95e2034640ce094ee438e6e320f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:56:46 +00:00
Treehugger Robot
27dea53939 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf am: da48c087e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I76e43d0d0b0bc31a94628950776f8732008592e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:56:03 +00:00
Treehugger Robot
1b91f61633 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev 2023-05-11 10:54:55 +00:00
Treehugger Robot
b1f6ae7816 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf am: da48c087e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I1e1960be47501efef395f413135691eb72f089b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:52:09 +00:00
TreeHugger Robot
c8d55217d9 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a am: 1609640693 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I053834788cb87b086f4c0d933d84a77dc782c3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:13:43 +00:00
TreeHugger Robot
df4135df6e Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 402ffdeaf6 am: 199e699214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ic99fb07b4c7bc3125e2680c0e68b20792ed45f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:12:30 +00:00
TreeHugger Robot
23f1777501 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a am: 729572c7c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I87b8672b99f8a9bfe0d4f03adfa62c24dfc8e257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:12:08 +00:00
Treehugger Robot
4d61561fa3 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I94f33e7f52875dbccbf6327430a6192ce01a4ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:10:41 +00:00
Treehugger Robot
da48c087e0 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I51b54455d5c2dd73c380fac22b345bc83570397f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:09:51 +00:00
Treehugger Robot
59fa9de0cf Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev 2023-05-11 09:42:23 +00:00
TreeHugger Robot
1609640693 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ie143435cbe81895834aaa32d53b7cef4e369845c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:28:05 +00:00
TreeHugger Robot
199e699214 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 402ffdeaf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I263cd51d709313f9f4a02c0082a6239df1df031a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:27:57 +00:00
TreeHugger Robot
729572c7c4 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I4b88361ee8642874efec24fdd04174ba13363658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:25:10 +00:00
Mill Chen
f321799f43 Update string for touch sounds 
Bug: 274081150
Test: visual verify
Change-Id: I953f108884cafc91e2a3a76bd1292ea30386d862
 2023-05-11 17:24:32 +08:00
SongFerng Wang
6c19f30e5d Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e am: 2bcba729cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I3f7096ea91f120b770d90eb11768f5806928ac0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:09:21 +00:00
SongFerng Wang
80cc037fe1 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e am: ac69e243c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: Ie24d17086cb0cbc7e5d31bd67104fe6e502a4dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:56 +00:00
TreeHugger Robot
402ffdeaf6 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Iacfe9bbe1a258baac3e48c24e283b1ed3954cf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:49 +00:00
SongFerng Wang
cf3414f8ec Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 2319563b00 am: 96df087783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I76defcdb6c47da075e432484db3e07308eaadee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:33 +00:00
TreeHugger Robot
520927752a Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ibb95d6559eccf81d77ebd9299359d3b93a3c784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:17 +00:00
jasonwshsu
7eeed19d28 Update hearing aids to hearing devices 
* We change the string 'hearing aids' to 'hearing devices', here are
  some left strings need to be updated.

Bug: 281782174
Test: flash rom and check UI
Change-Id: I0e3395c91d42b037158d135d1cbe519acac50aa0
 2023-05-11 16:41:54 +08:00
Yanting Yang
bc297b9f3c Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL 
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.

“System >Reset options > Reset app preferences” can take the above
actions which should be restricted by DISALLOW_APPS_CONTROL to fix the
security vulnerability.

Bug: 278559731
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: I387a95aa7f54fe04d5ed92372e43a88d5fe3e79a
 2023-05-11 16:29:07 +08:00
Angela Wang
fb0d23955d Fix non-hearing devices show in pair new hearing devices page 
Non-hearing devices are listed in "pair new hearing devices page" if we click the "See more devices" button and go back from "general pair new devices page".

Root cause:
Two types of Bluetooth scanning happen simultaneously and the scanning results of different scanning methods are handled in the same place. Currently the BLE scanning callback “onScanResult()” directly calls “onDeviceAdded()” method to handle the new scanned devices. This method is mainly called when receiving a broadcast of a new device found in Bluetooth classic scanning. The general pair new devices page uses Bluetooth classic scanning and the pair new hearing devices page uses Bluetooth LE scanning. The life cycle ordering when going back from general pair new devices page to pair new hearing devices page will be "pair new hearing devices page".onStart() -> "general pair new devices page".onStop(). It means the classic scanning is not stopped while the BLE scanning starts and this causes the scanning results from classic scanning unexpectedly added to the list which should only show the scanning results from BLE scanning.

Solution:
Separates the handling part of two scanning methods. Leaves "onDeviceAdded" handling Bluetooth classic scanning results only, and handles BLE scanning results in the “onScanResult” callback directly.

Bug: 279374435
Test: checks the result by switching back from "general pair new devices page" to "pair new hearing devices page"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Change-Id: Iebdde401ffb3dc0569478730a140a5dd7add115b
 2023-05-11 08:28:12 +00:00
SongFerng Wang
2bcba729cf Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: Id67f939ab2424f6913eb221bb6ed70d68f0e8393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:25:09 +00:00
SongFerng Wang
ac69e243c1 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I77e397cd0cc75fb1c5b6e93c909b4be293bc3b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:21:06 +00:00
TreeHugger Robot
d2e8495f4c Merge "Remove search entries from old pages when SC is on." into udc-dev 2023-05-11 08:14:04 +00:00
SongFerng Wang
96df087783 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 2319563b00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I1d2da49d6dae634f3498943fd42c79e5e2956076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:05:52 +00:00
SongFerng Wang
343602fd5e Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: Ifd85fa0461be871e9bdc52977f1e5b91a8fa1aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 07:44:20 +00:00
SongFerng Wang
2319563b00 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I7745d09826da393c5d3c2377f37ab2761d313dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 07:40:02 +00:00
SongFerng Wang
c487d5a10c Merge "Update the wording for LE Audio" into udc-dev 2023-05-11 07:11:11 +00:00
TreeHugger Robot
a40d45dec0 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337 am: 134b71f95f -s ours 
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

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

Change-Id: Ie66861304e65fec17aa48c59c11052c0cafc069a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 06:21:30 +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
949e8e505f [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 758c01fbb8 -s ours am: cfa6458241 -s ours 
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

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

Change-Id: I6d35d0d72ad481ed06153e0d285143ea731954f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:56:49 +00:00