Derek Jedral
b3524b4223
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 60419e72bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I8201e20c39ef02beebb117731b7ed9dcc105bae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 20:27:38 +00:00
Derek Jedral
60419e72bd
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I7b357d984dda1df053d2530f171c2523556d60d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 19:03:29 +00:00
Derek Jedral
42deb763e0
Merge "Change preference title if Active Unlock enabled" into udc-dev
2023-05-08 17:56:32 +00:00
Han Xu
db7883f0ed
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 am: ba00173dd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I96349b64c76c1245ca91460046700c377ba6ce6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:49:58 +00:00
Han Xu
07509fdb48
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 am: 3894103292
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I214ed455a66ce6ae4319d84be959a57bdbef6f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:05:24 +00:00
Weng Su
2b4d808898
Refine Settings textColor
...
- Update textColor from textColorTertiary to textColorSecondary
Bug: 271501723
Test: Manual testing with the Accessibility Scanner tool
Change-Id: I57c31ba5c6e066e21fea234502b24aaed15998d7
2023-05-08 21:58:45 +08:00
Han Xu
ba00173dd8
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I4c4af3d411c2cd86958aafea98597aca5d111fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:46:53 +00:00
Han Xu
3894103292
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: Icfa29d0fa13e61acee1a0173d3d6e6603c04c97c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:26:28 +00:00
Han Xu
7a1efdb589
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I3a93f7089e99b1c85191c29963cf35bcb4e65796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:01:03 +00:00
Han Xu
2f970a1a05
Merge "Fix wifi QR layout to fix image stretching" into udc-dev
2023-05-08 12:17:59 +00:00
Treehugger Robot
06e92b4bf8
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Idf5508432319cec7cc2f5239260e3365d6e55ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:52 +00:00
Treehugger Robot
6da502033a
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 2b6cf42130
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I6d2fb3b56242c3f2e089093cbe3081e2ef0ac30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:37 +00:00
Treehugger Robot
b5682235cc
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:00:53 +00:00
Treehugger Robot
2b6cf42130
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I5f349188e8965a7063c2ae5dfdbec6900e2e9855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:00:45 +00:00
Treehugger Robot
93ab64ef47
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I231ff30e5df9248bf3713511ebb00795c502cba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:56:22 +00:00
Treehugger Robot
23d3eda967
Merge "Fix the battery string incorrect spelling" into udc-dev
2023-05-08 10:36:09 +00:00
Angela Wang
d72f221a9b
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: 75b08ce5ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I1c8e3f1fbc69031a6837ea565be008088d4493b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:11:21 +00:00
Angela Wang
3716e194b1
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ibbb77dba4c77c09f2f6deb2db4bafefa82ed151f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:11:21 +00:00
Angela Wang
b03509284e
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I3e48ca3c397b530d8158d2e012d6a4867976b2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:33:26 +00:00
Angela Wang
75b08ce5ab
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I2b92a152a995f46684c2ebfc4a83694691f60743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:33:26 +00:00
Angela Wang
f676c35f02
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I80b2e6a7bbe73212482521e5810430b9dcd0252f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:29:26 +00:00
ykhung
f31c8a477f
Fix the battery string incorrect spelling
...
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
2023-05-08 16:10:27 +08:00
Han Xu
d2e6c2fe6d
Fix wifi QR layout to fix image stretching
...
Bug: 270063908
Test: manual
Change-Id: I86e7d54bb78306292fcb355c1a4879a43cc876f7
2023-05-08 15:58:04 +08:00
Angela Wang
1113d5e9b5
Merge "Hides Flash Notifications illustration on tablet" into udc-dev
2023-05-08 07:46:55 +00:00
Jack He
e64f750f61
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: e188c6c0bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: I23d06ed58ed7725bfb1eed931db3ba313291c1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:57:41 +00:00
Jack He
a38db8628e
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: I72f712e1996efe37547b14ca2e0c5dd806a49180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:56:57 +00:00
Jack He
e188c6c0bd
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: Iad8cc1c422d29fd5adda2b026eabd8c7f8f4f333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:16:08 +00:00
Jack He
22e2bd2b85
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: I5ad786001f89627dbede25e1db8aae59da83af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:16:06 +00:00
Patty Huang
636eb36df0
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938
Change-Id: I5cfb6ea17ed21f359c07f67b299f6f57c6f6d63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:16:05 +00:00
Jack He
2605ccbcfa
Merge changes from topic "LeAudioBeta" into udc-dev
...
* changes:
Hide the LE audio toggle by flag
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
2023-05-06 00:42:40 +00:00
Max Spencer
bd861db36f
Fix title of no-screen-lock notification
...
Discrepancy was surfaced during localisation testing.
Fix: 281054224
Test: None
Change-Id: Ifabafbf5af0775e25b2c41670318a3aabc2cb7f2
2023-05-05 16:21:52 +00:00
Marcello Galhardo
bb8c04e072
Move Note Shortcut from Settings to SystemUI
...
* Removes all code related to Note Shortcut from Settings
Test: manual
Flag: not needed
Fixes: b/280431176
Change-Id: I6bb6cfbb98a57b6ad3cf261626b3d84d0be96e53
2023-05-05 14:54:27 +00:00
Vania Januar
e622a1ec70
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 68c23c5556
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Ibbf0986144059366097e248da0619dc6466699b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 11:23:51 +00:00
Vania Januar
aa438742ed
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Ie8ee82c7ec38135b7f8bba33e171aece1bf337a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 11:23:05 +00:00
Vania Januar
68c23c5556
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Ie3b86edbbc553b2aa6c94dbefab8c3084db790ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:45:42 +00:00
Vania Januar
247fed89c4
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Icc6d64627bba5370c4d68a0456c0d2641540cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:45:36 +00:00
Vania Januar
7f65b03c73
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Ifba006b60361a77faea3e25e4cfa73e3aa53fa44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:41:27 +00:00
Angela Wang
360cb671f2
Hides Flash Notifications illustration on tablet
...
Since tablet illustrations are not yet finalized, we'll hide the Flash
Notifications illustration on tablet for now.
Bug: 280748155
Test: checks the UI on phone and tablet manually
Change-Id: I5a309dec3291f3585cc1d9769e2465c94250fa7f
2023-05-05 09:54:04 +00:00
Vania Januar
072d8b90d0
Merge "Replace placeholder icons with stylus icons" into udc-dev
2023-05-05 09:50:11 +00:00
Treehugger Robot
e1e392ba22
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-05 00:04:14 +00:00
Bill Yi
077c0002e1
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-05-04 22:28:31 +00:00
Bill Yi
6819d0b2ea
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-05-04 22:28:31 +00:00
Oli Thompson
98cfe37cbf
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: 40c016b0d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I9984d7becf8c5070d985e5a1465b170aae439112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:02:07 +00:00
Oli Thompson
3c003a0300
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: If9125a6c97bfb3520e2ee31f68e178c604f29f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:14:11 +00:00
Oli Thompson
40c016b0d1
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: Ibf70e18ac501c15790ff111154a824ae432b1af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:59:00 +00:00
Oli Thompson
a99e532ce8
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I7af3a61b06c9922be100dbba9a2bd0b58ba784d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:57:31 +00:00
Oli Thompson
983c8081db
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I75481f3d79891dba6f6fd5b1355433e288dac3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:53:30 +00:00
Oli Thompson
69fcc2ba5c
Merge "Change icon in settings work challenge" into udc-dev
2023-05-04 18:28:23 +00:00
Lucas Silva
69b0fd5d45
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a am: 86231b9ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: If7e797520ae040dc9439b6c304da6afb9c09ca84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:09:46 +00:00
Lucas Silva
51fac72ca2
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a am: dc0ac9407e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I53204cbdda1d531826ee84d1d0758a108ea5a2e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:06:28 +00:00