Jason Hsu
782ad66ab1
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344
Change-Id: I1abbb60af43135718426d349427738d95808ff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:23:10 +00:00
Jason Hsu
3f6e93beea
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344
Change-Id: I6d9508e5c6464236eb875942ab8bcf2d3160cead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:21:28 +00:00
Jason Hsu
181cfa3aa5
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev
2023-05-12 14:20:23 +00:00
Peter Zhang
cede538007
Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02 am: 884e3b3ef8 am: 782ba7d863
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598
Change-Id: I56311f1c0e8de1f0d7ae1bf82f36e491eabc015b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:50:07 +00:00
TreeHugger Robot
3181169bdb
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: I1f8b3127c7c15c108ffe183d71d740e0473be636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:25:30 +00:00
TreeHugger Robot
64bd7a0635
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: a102821490
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: I9c36ae60f55856c752ffad66898f4c59e034638f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:21:27 +00:00
TreeHugger Robot
76acd0b166
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: I880419eeec294f49011f25126ec015a7fe6853f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:21:23 +00:00
TreeHugger Robot
a102821490
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: Ib04d55ce7a2d5a840e6f8fc9758eaab6b60374c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:16 +00:00
TreeHugger Robot
e64a1b4992
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: I12e3afcddba6810e81a2e93d27a540b03358ec72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:06 +00:00
TreeHugger Robot
499dc2c2b3
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: I13c85961b123dadc3688f0e922994c54e9394a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:38:38 +00:00
Peter Zhang
08e762c056
Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598
Change-Id: Idd783b4f20b0b4ae5d6053f0713fd98cc4af789c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:23:01 +00:00
Oli Thompson
b3fbb562de
Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: c5d6f00d7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125
Change-Id: I594b2a7ae97a6bb00c3b83b56bc8115bcb03c34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:21:49 +00:00
Peter Zhang
884e3b3ef8
Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598
Change-Id: I63d4c2c08447a78ee162a79d26b50ccb074d566f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:19:15 +00:00
Avinash Vadlamudi
6968e32ed9
[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon
...
Bug: 281946128
Test: Manual test by flashing and testing on device
Change-Id: I182e530bc39620582a0c228ab3d5934638474da2
2023-05-12 12:18:03 +00:00
Oli Thompson
d134502801
Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: 6ea5106ae6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125
Change-Id: Ia40eb7110721165bf4fdd25705ba68c22d48b32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:17:54 +00:00
Oli Thompson
82129a404a
Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: c5d6f00d7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125
Change-Id: I96bebdd1607adc0b1955dbef80001bd1488d1d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:17:43 +00:00
Peter Zhang
5b81bbfd02
Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev
2023-05-12 12:12:21 +00:00
TreeHugger Robot
fd9ca0eae7
Merge "Update string for touch sounds" into udc-dev
2023-05-12 12:08:32 +00:00
Oli Thompson
c5d6f00d7c
Merge "Update Work profile settings" into udc-dev am: 787a054c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125
Change-Id: I7fb263356e2430ec4aaddf3222c45e1fc9885167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 11:40:19 +00:00
Oli Thompson
6ea5106ae6
Merge "Update Work profile settings" into udc-dev am: 787a054c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125
Change-Id: I6bc4625b6cdf79aa437d525aff8778b553ed2c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 11:40:18 +00:00
Oli Thompson
ef25255311
Merge "Update Work profile settings" into udc-dev am: 787a054c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125
Change-Id: Ida56d040d8ea5361f3aa57dd8fecd62124a438d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 11:36:03 +00:00
Oli Thompson
787a054c93
Merge "Update Work profile settings" into udc-dev
2023-05-12 11:05:57 +00:00
jasonwshsu
212470d0a6
Move 'Audio Output' to Accessibility hearing device page
...
* Extract the common part into HearingAidHelper.
* Remove abstract getHearingDevice(). Change to get the hearing device when needed.
* Move several classes from Bluetooth into Accessibility
Bug: 281783079
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(HearingDeviceAudioRoutingBasePreferenceControllerTest|AccessibilityHearingAidPreferenceControllerTest|HearingAidHelperTest|HearingAidAudioRoutingPreferenceControllerTest|HearingDeviceCallRoutingPreferenceControllerTest)"
Change-Id: I79049107409b7086c6dcc8d48a6323e171ed1535
2023-05-12 13:46:53 +08:00
Yanting Yang
64c085bd19
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: Icf34fd8963fb99eb9a5b85c8a14489290bfd7f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 04:38:46 +00:00
Yanting Yang
c164a9af40
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: 76d3a97aa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: Ie538852e678cb710fff0986ae4f7f2da0ad0f9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 04:34:38 +00:00
Yanting Yang
915d32a8a8
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: I58d5f3e974ae451a1b3305410ccbabc7ce203b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 04:34:28 +00:00
Yanting Yang
f2c5b7f2e7
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: Ia8fc7ff7f82323e2bd55ad023e90bf6e50431197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:57:04 +00:00
Yanting Yang
76d3a97aa9
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: I5bd7d6ec4d0f5685a3d629722cc40d8794b378e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:57:02 +00:00
Yanting Yang
eb028da005
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: I6d727ab9e5e30f1db9a3b6eb9f0ea63ea44c664d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:52:46 +00:00
Yanting Yang
f0e440109f
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev
2023-05-12 03:20:14 +00:00
Hao Dong
c5b3f62935
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: Icffc3a12145527dcb8c9873719c1c4a3adc8f1f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:34:09 +00:00
Hao Dong
2c3346a4e6
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: 771df2f4a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: I19309051047d2b5f504ba8c8f6a9f9e591ddd4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:32:18 +00:00
Hao Dong
6832a32430
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: I1da1719b323d55674ed01bfe12e9afa52e62075a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:31:44 +00:00
Hao Dong
771df2f4a6
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: I2a41cd67710f34cd74123e6979806a15d07783b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:56:23 +00:00
Hao Dong
dd373e10e5
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: Ie5214e9c1dafbbc9fbadcf1cbbdb653a43afc581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:52:55 +00:00
Hao Dong
2386847a2f
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: Ibbea1584e774a5249bfb73d8f3e98b175b963225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:51:36 +00:00
Hao Dong
1eb3724e1f
Merge "Hide description text view if there is overlap." into udc-dev
2023-05-11 22:10:55 +00:00
Treehugger Robot
ec9917069a
Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: I6c336bf3632b810a6f6768afa590d8ab85b613d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:42:46 +00:00
Treehugger Robot
297fd154a2
Merge "Fix string" into udc-dev am: 81ac516705 am: 6dd1415360
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: Ia5b0a4d82084445bc93f952358df36e98147235e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:17:15 +00:00
Treehugger Robot
9bd80164e2
Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: I722191069fb3273957f569354179ace9311e805f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:03:25 +00:00
Treehugger Robot
0b57a35470
Merge "Fix string" into udc-dev am: 81ac516705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: Ia806f9235c495cd7d97953b5c07b2a66c454a358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:59:03 +00:00
Treehugger Robot
6dd1415360
Merge "Fix string" into udc-dev am: 81ac516705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: I0920365fe3dd0e9ee7958ac82fbeb6f8359c6f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:58:53 +00:00
Treehugger Robot
44c807906b
Merge "Fix string" into udc-dev am: 81ac516705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: I46eb103dc599e26b08d460e49c8fd673a4c1e749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:54:12 +00:00
Treehugger Robot
81ac516705
Merge "Fix string" into udc-dev
2023-05-11 19:21:54 +00:00
Hao Dong
4762df7e21
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665
Change-Id: I8f0423bba882ed4d2ba3c84fb99dbb38aef0683f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 18:41:24 +00:00
Hao Dong
3d52ce0a95
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665
Change-Id: I6436874a454da9870a6e872e67334a5432c77635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 18:39:04 +00:00
Hao Dong
51554eb9a1
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665
Change-Id: I0fe97397b725927263ef4bf4e550199911c64217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:57:59 +00:00
Hao Dong
a17d706d89
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665
Change-Id: Iedba9fd97c7657ac860276f7a0a19e0a89c4541b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:56:56 +00:00
Hao Dong
0ff2d2b2af
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665
Change-Id: Iaaab846636e37e82b01d0a11881083be760a482a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:54:13 +00:00
Becca Hughes
f7c4d9c903
Fix string
...
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
2023-05-11 17:45:30 +00:00