Julia Tuttle
ee0d1171aa
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Ieaf111aae95150c6c7480ee0693478be934d6353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:47 +00:00
Treehugger Robot
975e782dd4
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 14:37:21 +00:00
Treehugger Robot
e1858cab06
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I41a6347afc1fe6a038ac75bf6a76855b42268f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:50:31 +00:00
Treehugger Robot
45918b72bf
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I11e6110ba0b640be8b373d9afd45f806c005b05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:13:42 +00:00
Treehugger Robot
aa3dc53d97
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"
2023-06-20 12:13:34 +00:00
Dmitrii Merkurev
d7d4ec224f
Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE
...
Currently factory reset action is ignored if
PERSISTENT_DATA_BLOCK_SERVICE isn't presented on device.
Make sure that we can execute regular factory reset without
it by utilizing the logic from shouldWipePersistentDataBlock.
Test: manual verify on aosp build
Bug: 129137473
Bug: 196634851
Change-Id: I2abcb93cbc0872dd920c1dd62152596ddd723691
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com >
2023-06-19 21:06:25 +01:00
Chaohui Wang
6bceb29408
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: I936a6e4a4f24a7f8c238662ec09a02f7a3e985e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 10:45:36 +00:00
Chaohui Wang
b1231c5f15
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: I9e87eec0995e9dde010a51e3a7ccbaf68839a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 09:56:38 +00:00
Chaohui Wang
7fdf1c4b17
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: Ia337805f374b7c05bac8902ff9add84ced999f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 09:17:09 +00:00
Chaohui Wang
85c1dea20a
Update the OWNERS for bluetooth & connecteddevice
...
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
2023-06-19 07:35:20 +00:00
Julia Tuttle
b23136041d
Fix colors in importance and conversation priority preferences
...
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.
On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!
Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
2023-06-16 19:17:09 +00:00
Treehugger Robot
2d23561a25
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 11:44:07 +00:00
Treehugger Robot
2010c175a6
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:33:50 +00:00
Treehugger Robot
2c73cc8ca8
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 09:50:45 +00:00
Matías Hernández
33e5518af1
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ie91f13e1b27753177e9bd7f7b88e9f2821cdada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 16:38:43 +00:00
Matías Hernández
bbfe425326
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I1f7f948108f6f3e9a0ca2f978aaf1847c7c3e496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 16:38:15 +00:00
Matías Hernández
46cdbed02e
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I91e72e84a4f239501953dbcf048f6043ea588ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:55:36 +00:00
Matías Hernández
dcbe38baa9
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I69d2ef43afb54ce3b9d141d4f676b688dd1c5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:52:58 +00:00
Matías Hernández
0166bcc776
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I33040a000b1bc4e90b9e76c8e751bca2e09959d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:10:59 +00:00
Matías Hernández
2b1faa0aea
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:09:53 +00:00
David Magno
50e8eab484
'Mobile plan' is searchable even if it is unavailable
...
'Mobile plan' yields a search hit event though the 'Mobile plan'
setting is unavailable on the device.
Bug: 287198186
Test: Manual
Change-Id: Ibc6f01602a364ae902f8a6ce15083890e89446d2
2023-06-14 16:25:27 +02:00
Matías Hernández
0aa241be99
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:42:07 +00:00
Matías Hernández
50df60c93c
Don't hide approved NLSes in Settings am: ff255c6eda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:57:15 +00:00
SongFerng Wang
7f29649aa9
Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772
Change-Id: I278260f1a36ed24fd1ca2d53ffc7ff2431fd1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 07:54:48 +00:00
SongFerng Wang
61ef9024c8
Merge "Remove the owner" am: 286344d539 am: 448c8b61a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772
Change-Id: I9b061b1c90bc7033e4400d192ed5211e9ea9bb13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 06:20:17 +00:00
SongFerng Wang
448c8b61a8
Merge "Remove the owner" am: 286344d539
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772
Change-Id: Iad21da9fbcd8d9279c27beb7a7c0761644d8f2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:36:47 +00:00
Zaiyue Xue
da62051efd
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Ie9e6621a39e30b5ba000e2bf6516719eea2a8fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:39:42 +00:00
Zaiyue Xue
8c25fe4c60
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev
2023-06-14 03:01:25 +00:00
SongFerngWang
f405dadcf2
Remove the owner
...
Bug: 286964921
Test: build pass
Change-Id: I4daf629e8cb994753dca36a811f0d25685df6928
2023-06-13 15:10:46 +08:00
Taran Singh
6f6747910d
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I44012b898eec57e26fdc4d6d4a38c54578b8a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:37 +00:00
Treehugger Robot
decc428857
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev
2023-06-12 19:57:26 +00:00
Han Xu
2fb6c5887d
Add manufactured year into hardware info page am: b452bc9f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I59bab60a59b531e25663b3e34a554f3ac7dfc87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 17:44:38 +00:00
Han Xu
b452bc9f9d
Add manufactured year into hardware info page
...
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Zaiyue Xue
ec032710dc
Don't load battery entry names and icons in offline job to improve memory usage.
...
Risk: low (The name and icon will be always loaded again in the UI.)
Bug: 280720236
Fix: 280720236
Test: manual
Change-Id: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
Merged-In: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
2023-06-12 10:49:01 +08:00
Avinash Vadlamudi
90d3d346e6
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571
Change-Id: I58b483720e2a7ed6ed5d92094192fe2b7a5f3df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-10 01:58:13 +00:00
Avinash Vadlamudi
01637b556e
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus
...
- set accessibilityLiveRegion as Polite mode to allow talkback to announce the state of checkbox even if is not in focus
Bug: 281950677
Test: Manual test by flashing on device and checking in talkback mode
Change-Id: Ia1066e2df1f40e6c339a4cd63f92acf0858f8f3d
2023-06-10 01:25:18 +00:00
Mady Mellor
9db4671279
Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468
Change-Id: I045d775faec3df27cfde23e9b52ca29574d20511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:13:15 +00:00
Oli Thompson
86f36a032f
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338
Change-Id: I06044fd93191b0799858c6db9f194a222fa7fe99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:12:19 +00:00
Mady Mellor
57406435cf
Merge "Update the colors for bubbles settings based on new spec" into udc-dev
2023-06-09 15:33:30 +00:00
Oli Thompson
01b382546e
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev
2023-06-09 15:31:17 +00:00
Oli Thompson
dcce8fa662
Fix emergency button not visible on pattern work challenge screen
...
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing
Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
2023-06-09 13:06:39 +00:00
Mady Mellor
fb1e921bd9
Update the colors for bubbles settings based on new spec
...
Test: manual - get a bubble, go to that apps bubble settings screen,
observe the colors look correct, switch theme and
check again.
Bug: 283951560
Change-Id: I28fa64f8d7b53419a57615bf3da4da7eff049674
2023-06-08 13:23:54 -07:00
Mady Mellor
020007946a
Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273
Change-Id: I20c56b5838988404b13524d88c2e9ff9467d8484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 18:18:17 +00:00
Mady Mellor
8a47899369
Merge "Fix colors in bubble settings so they're more visible" into udc-dev
2023-06-08 17:35:55 +00:00
Mady Mellor
f184678802
Fix colors in bubble settings so they're more visible
...
Test: manual - get a bubble, go to that apps bubble settings screen,
observe the colors look correct, switch theme and
check again.
Bug: 283951560
Change-Id: I361b1c20e293c02b4d604e0b5845a074c31e5103
2023-06-08 09:21:13 -07:00
Joanne Chung
89c82f5894
Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 am: 16a3800902
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630
Change-Id: Ica9e62112a10211e4ed6a7dd2633ff86050df231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 08:53:40 +00:00
Joanne Chung
16a3800902
Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630
Change-Id: I7dd7e11968e601d180cb928dd6dcb0803dedf523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 08:05:03 +00:00
Joanne Chung
e7b01f0ce8
Merge "Update OWNER file to new owner" am: 6c84f9128d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630
Change-Id: Ie7ac04781ba486dd74af1df57a995636453eb21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 07:23:35 +00:00
Joanne Chung
674ae4ae93
Update OWNER file to new owner
...
Bug: 177641730
Change-Id: I68e9986338e04bb81a11a495f6de1657399b5742
Test: n/a. Only update owner
2023-06-08 06:40:41 +00:00