PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,823 Commits 1 Branch 0 Tags
7081c9eeb10f3f87f0fa14dfcd045b55b7eab67c
Commit Graph

121823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
195fba4c28 Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev am: 2d53aabf74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983045

Change-Id: I3588d288329462658977e069448dfccf57d51f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 16:10:42 +00:00
YK Hung
2d53aabf74 Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev 2023-03-13 15:25:15 +00:00
Pavel Grafov
e5d082b0dc Show work lock confirmation in a task overlay 
WorkLockActivity is added on top of each task that has any work
activity when the profile is locked. This activity is a task
overlay meaning it stays on top of other activities. It then starts
ConfirmDeviceCredentialActivity, also as an overlay because
otherwise it will sink under WorkLockActivity. But when CDCA
launches CofirmLockPattern, it is not set as an overlay and as a
result is not visible. These CLs add a boolean extra to instruct
CDCA to launch CLP (or other activities) as an overlay.

Bug: 271840143
Bug: 234002331
Test: manual, with TestDPC setting password reset token.
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: Ie9b593696a24ad0c435b36eef80e3fe760c588ba
 2023-03-13 14:49:57 +00:00
Matías Hernández
23d25dde02 Show correct chevron for "Priority" on RTL languages 
Fixes: 232397646
Test: N/A
Change-Id: I3b653163a66fcd0b6fa80895495d039f53c934f0
 2023-03-13 14:49:29 +01:00
Automerger Merge Worker
b981e3ae7b Merge "Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c am: 392cd4be96" 2023-03-13 12:49:08 +00:00
TreeHugger Robot
4d72aa5cba Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c am: 392cd4be96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I023b300a1d5f222bf51dc0218c1adcf3b5006c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:49:03 +00:00
TreeHugger Robot
47fba2caf5 Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c am: de6666f95b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I6c76de4e9ad67db977159b84ba5e779f786a7a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:49:01 +00:00
Automerger Merge Worker
4de41901fb Merge "Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 am: 909f5335d7" 2023-03-13 12:47:54 +00:00
Paul Wang
5739d79de8 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 am: 909f5335d7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: Ie1715219f22b71e8c9bea8ee5a44b1e4283581cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:47:44 +00:00
Paul Wang
c071a30ef3 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 am: 553a0dd2da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: Iba441d1e54e61caaaed3d9aa3b4be02031adb0ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:47:40 +00:00
TreeHugger Robot
392cd4be96 Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I4dc8aa7aa34749795ee5341bbd92b2c8b50e4d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:13:21 +00:00
TreeHugger Robot
de6666f95b Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I6056bfe83cbea36e224c7a73758e729c681c5188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:13:14 +00:00
Paul Wang
553a0dd2da Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I72d98933ef98940ee4149201f30c0fe8dc95a462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:12:54 +00:00
Paul Wang
909f5335d7 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 am: eb39a6dbd5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I3c87c1030ed7d9af51e05cabf909509dc8628506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:12:49 +00:00
Matías Hernández
32f8c390c0 Fix icons size in "Add DND Schedule" dialog 
(An alternative option is to use app_icon_size and let the row grow with a padding/margin... but the icons were humongous, so having a fixed size looks better).

Fixes: 231677100
Test: Manually on phone & tablet
Change-Id: Icea9c1a5af47e66ee35685686fbd927d04adae0c
 2023-03-13 12:10:36 +00:00
TreeHugger Robot
25b2c5a63c Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev 2023-03-13 11:51:12 +00:00
Paul Wang
eb39a6dbd5 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I7817be6bc82ac48127b00d0de8d644450a21711e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 11:35:03 +00:00
Zaiyue Xue
64965ded30 Replace stream().min() to Collections.min() to avoid stream object. 
Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: I36a162443e8e275b03f804edb4fc6b421deb345d
 2023-03-13 19:06:53 +08:00
Matías Hernández
89f93a9bb1 Close ZenModeScheduleRuleSettingsActivity when rule is deleted 
This fixes an issue where the ZenRuleButtonsPreferenceController was redirecting to the rule list, but the container fragment was still trying to refresh the rule, leading to a "rule not found" toast. This also makes the transition look nicer, as it's a "back" instead of a "forward" animation now.

Fixes: 244103559
Test: Manually on phone & tablet
Change-Id: Ie26511dcaec4c7976f488936cdc6d417110ca1b1
 2023-03-13 12:03:27 +01:00
Paul Wang
d4fbc38279 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I2ba651e080ca1f054ff03d3d125848031ced4e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:58:14 +00:00
TreeHugger Robot
22ab6c2735 Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e am: 2a28840820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I3b34ef7587fe6fa99f01854bcaed4098b8848c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:41:32 +00:00
TreeHugger Robot
c21d06d8e0 Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e am: 7db8aed96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I1f47e62f2673d76f7c9444cb37cf0ea55ebb039c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:40:11 +00:00
Jason Hsu
fdc203d5a6 Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 am: c25e248a66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

Change-Id: Ifee986d6e5257b03d4e22959c5cee43512c5cb30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:39:07 +00:00
Jason Hsu
977a6bf0fa Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 am: 13c960629b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

Change-Id: Ib89bd67123b705c864d8ec7c4bd336c8699670fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:37:52 +00:00
TreeHugger Robot
7db8aed96c Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I948b11e9e74c4c2b010299522991861c54d11d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:23:59 +00:00
TreeHugger Robot
2a28840820 Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I16f465c28dd7638ab0f380ec31c3e05eaf07ef54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:23:33 +00:00
Paul Wang
d60b851b93 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I231847656a260eff43204306faf8c3908c9fc8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:22:11 +00:00
TreeHugger Robot
85ca6e6a5e Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev 2023-03-13 10:15:36 +00:00
Jason Hsu
c25e248a66 Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

Change-Id: I38b2df8182985fe1c3e38dc22f2d5992307150cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:06:39 +00:00
Jason Hsu
13c960629b Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

Change-Id: Ibaa6b0372a74f0ad07a3f7a3dce0a26c9f6cdf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:05:55 +00:00
Paul Wang
dd3d813ff3 Merge "Avoid disabling LE Audio when BT is off" 2023-03-13 09:55:49 +00:00
jasonwshsu
6a2db7ee4d Return getMetricsCategory() for each new page hearing aid and flash notifications in android U 
Bug: 262839191
Test: manual test
Change-Id: I066f49a2537b798132b484f6eff0d0314a164138
 2023-03-13 17:45:30 +08:00
Jason Hsu
de202d5307 Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev 2023-03-13 09:34:58 +00:00
Candice Lo
f4969d69d1 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours am: b64632bcf7 -s ours am: dc2b52fa21 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

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

Change-Id: I3d06c42e0e8b96032f6aa4a0f7539bdda3909a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 09:10:39 +00:00
Candice Lo
a86aabee4a [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours am: b64632bcf7 -s ours am: 151ffe1ea7 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

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

Change-Id: I40b7809d9bf2cc45a54b7f384f8284d505b77cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 09:08:34 +00:00
Candice Lo
dc2b52fa21 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours am: b64632bcf7 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

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

Change-Id: I56a3858c8a8dc18458c365452485cbbd066cee2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 08:37:02 +00:00
Candice Lo
151ffe1ea7 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours am: b64632bcf7 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

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

Change-Id: I45626763f82479e0a953abad549ed62af73b562b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 08:36:07 +00:00
Zoey Chen
63978e7e52 [Settings] 1. Show default subId SIM page if get an intent with invalid 
subId 2. Fix the hotswap UI issue

Bug: 271635200
Bug: 271347499
Test: local test
Change-Id: Iac61a211fce7bcd85da48cb291f46584cf43f5c5
 2023-03-13 08:12:20 +00:00
Zaiyue Xue
a528f1e382 Fix b/273175976: Screen time counts the time before full charge. 
Use the raw start timestamp instead of the first timestamp in the level
map to query app usage time.

Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: Idb43b2bd5378e2f34ec722354408754f4a439c6d
 2023-03-13 15:59:05 +08:00
Candice Lo
b64632bcf7 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

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

Change-Id: Ib94406415a0913a62c1a93a4a3ab56b25543950e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:57:53 +00:00
Candice Lo
934beb4127 Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725

Change-Id: I0b61473ac3ef0a91e2ed901d7b2deb1e35268866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:22:21 +00:00
Candice Lo
91eab671d1 Merge "Set the settings key when the font size is changed" into tm-qpr-dev 2023-03-13 06:51:27 +00:00
jasonwshsu
2bf80d8bf2 The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture. 
Root Cause: Did not update dialog when user back to previous page.

Solution: Merge the solution in ToggleFeaturePreferenceFragment.java

Bug: 263451053
Test: manual test
Change-Id: I99513fa70cf44b32a0fb78a5f953e41373e086f4
 2023-03-12 20:47:25 +08:00
jasonwshsu
052c07b4d4 Click the search result "System Sounds" will crash the Settings app 
Root Cause: Preferences in this page need to pass CachedBluetoothDevice or will finish the page imediately

Solution: theses preferences are in device detail page which will only show when device get connected. Show them in search result is not reasonable. Remove them.

Bug: 270508779
Test: verfiy it did not show in search result
Change-Id: I866d7be158ff87343d76fa0b3173382880c4aa6e
 2023-03-12 02:48:13 +08:00
Diya Bera
cbc16fc5af Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a am: 0fcf95b375 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I189d43953b4cb8c0844f918d531298422d1699a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 03:02:14 +00:00
Diya Bera
ab90af039c Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a am: bee78a3d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I44eaa8ffc6cf0fb3ec6cabfacb1b672033fa6b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 02:46:39 +00:00
Diya Bera
0fcf95b375 Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I50bc1a5529ebb04798f8b41c7cfa675bcaff54bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 02:29:44 +00:00
Diya Bera
bee78a3d59 Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: Ieaf430842a766ff697b5de93bf4ed24db05186ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 02:00:12 +00:00
Diya Bera
3a4c6feb0a Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 01:14:57 +00:00
Diya Bera
9a93c8a00f Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: Iddfaa9baa18e16d3b1f5e06de88d74faf208c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 23:26:58 +00:00