Commit Graph

28816 Commits

Author SHA1 Message Date
Xin Li
770a4e1f11 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:35:36 +00:00
Xin Li
f8a0c0323f Merge UP1A.230905.019
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Change-Id: I2a988e3da0958f31323f95588e1ac66482186ecf
2023-08-31 12:31:10 -07:00
Bill Yi
d3e67b615d Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-08-31 18:57:38 +00:00
Bill Yi
2a5e445593 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2f272e914c7b2f0f5e428ceed87c3d66cf4e8fca
2023-08-30 19:40:08 -07:00
Bill Yi
8f8a434c4d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1df59a39a32f1509838c51a08fd62430231e1f01
2023-08-30 19:38:08 -07:00
Treehugger Robot
6d9e295c3a Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I5a2b645fce8800da77ff886f8bc69a20efb34d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 08:10:45 +00:00
Treehugger Robot
5bc143402c Merge "Crash occurs when entering a Bluetooth broadcast password" into main 2023-08-29 07:32:28 +00:00
Xin Li
6b3d512b63 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Change-Id: I4ed5b2e4c6c59527bb544e8b6dff2b9d4cee9025
2023-08-25 13:50:56 -07:00
Roshan Pius
4e4877916d Implement DISALLOW_NFC AE user restriction
Bug: 271452372
Test: Compiles
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
2023-08-24 20:39:23 +00:00
Jin Dong
7f177801eb Crash occurs when entering a Bluetooth broadcast password
BT crashes when entering a password longer than 16 characters.
Limit the password length to 16 characters.

Fixes: 292053940
Test: Manual
Change-Id: I1ed2cfc33c3b0dbdcf2a9c865b748b6376bce1bc
2023-07-20 15:15:34 +02:00
Michael Mikhail
2b49d000b6 Add content description to volume title in settings.
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.

Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:499f965c1c79cea14377c37028133a9f8717693d)
Merged-In: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-07-05 23:27:34 +00:00
Bill Yi
588001801a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic6f318bc10b367849754f16f9c02a9aa75a24b74
2023-06-21 16:32:09 -07:00
Bill Yi
b37162ce4a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
2023-06-21 07:15:19 -07:00
Bill Yi
d0213cd684 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7725eba9eba2160e5a330d92a312f45d677b91a7
2023-06-20 19:28:50 -07:00
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
Julia Tuttle
bd74e47e5e Merge "Fix colors in importance and conversation priority preferences" into udc-dev 2023-06-20 16:21:01 +00:00
YK Hung
5007841ebd Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Id6b352d47918565fac42659529c97d1b4c89606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 07:01:29 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +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
Wesley Wang
ddbb5bcd5c Update tablet help article link (1/2)
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
2023-06-15 14:38:59 +08:00
Treehugger Robot
c706f8544d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Bill Yi
23819646e2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7203e546696a4dde1d8c8f7b32e6a432f7a5bcb8
2023-06-12 13:29:45 -07:00
Bill Yi
b86bd3cfe3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I03150507e9d454e50da97bbf70752f7fc2736975
2023-06-12 13:26:17 -07: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
Jason Hsu
d2c7424293 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I4fd0ed02f598224a5f93aa646f8895298a64ac90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:09:31 +00:00
Jason Hsu
fecfa96723 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev 2023-06-12 03:54:11 +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
jasonwshsu
ac04ce9091 Change the summary string to exclude 'Audio output' feature
'Audio output' plan to punt into U-QPR or V. Change the summary to not mention it.

Bug: 286174797
Test: flash rom and check UI not exist
Change-Id: I66ffb26c9b9ed612f41be7025a474cc63f256d87
2023-06-08 09:05:53 +00:00
Treehugger Robot
c83e401444 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I25e8ab52aa7a285e22ec067d56d1a4a2e3252ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:56 +00:00
Treehugger Robot
a34a510a40 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev 2023-06-08 00:15:18 +00:00
Oli Thompson
ab73c1a3e3 Fix low contrast on work challenge screen emergency call button
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
2023-06-07 19:25:59 +00:00
George Chang
f63518f864 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I1b0246e219089604709900c2d8deb8d2e3d8a565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:29:02 +00:00
George Chang
832e0b015e Merge "Correct typo in the launch via NFC bottom string" into udc-dev 2023-06-07 09:02:51 +00:00
Treehugger Robot
d8d85a8485 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
George
d41299016e Correct typo in the launch via NFC bottom string
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
2023-06-06 21:39:01 +08:00
Treehugger Robot
ae50f4d0e6 Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: Ia2d93b574bf5a744d129558e92f19fa5229486a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 06:33:51 +00:00
Treehugger Robot
185244f43d Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev 2023-06-06 05:49:40 +00:00
Treehugger Robot
6cb0b2c68e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-06-05 19:36:58 +00:00
Bill Yi
d152c7b1bf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4fe08ee7dc7f803451ff0389a2587a5c99d1023e
2023-06-04 18:40:52 -07:00
Bill Yi
7d99401b8e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I855db4675b33516b1bd38cb58406a9daa8ca188e
2023-06-04 18:37:48 -07:00