Bill Yi
131903dd2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Icd6cc592217548df11b658f141d8dee124e99b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:47 +00:00
Bill Yi
537b47d74e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ie56499fb898021c83535e0db7f0552c9400e7956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:43 +00:00
Bill Yi
04b439f643
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I6157b0172eca6b502973a9fc653fae093518edeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:23 +00:00
Bill Yi
4314b79c07
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e3fc8dd
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774215
Change-Id: Ia70db1d311f37bdb567a20b8655e6fdd67fdc37d
2022-06-07 22:40:42 +00:00
TreeHugger Robot
193f799f88
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev am: 909b62ffa4
am: 0b79b0831d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740330
Change-Id: I241fe9546575df2d978a360f906116feffd50de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 18:53:53 +00:00
TreeHugger Robot
0b79b0831d
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev am: 909b62ffa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740330
Change-Id: Ida08053974615bb1200e20b6f90ca0adbc79d4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 18:36:21 +00:00
TreeHugger Robot
909b62ffa4
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev
2022-06-07 18:16:32 +00:00
Ronish Kalia
9e4f2478dc
Merge "Add support for directly opening ringtone picker"
2022-06-07 16:15:18 +00:00
Ronish Kalia
8d224da75c
Merge "Add support for launching user edit dialog"
2022-06-07 16:13:16 +00:00
Bill Yi
e6b9e1fdf5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Bill Yi
6a7e3fc8dd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I490033f7244d12463519754330d8ff76c5753005
2022-06-07 07:21:14 -07:00
Zhe Song
90c02742e6
Merge "Fix AVAILABLE constant to be search indexable for Enhanced Notification."
2022-06-07 11:21:43 +00:00
Chaohui Wang
a57a41c0db
Merge "Clean up unused PreviewSeekBarPreferenceFragment"
2022-06-07 10:08:24 +00:00
Automerger Merge Worker
588d5db985
Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524" into tm-d1-dev-plus-aosp am: 2de1730ca0
am: 2a3e6630ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: Ida42fc01d7d170204177bb0e395665f66733a21b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:31:04 +00:00
Edgar Wang
dfe3692258
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 025baa318b
am: 0d22bf453d
am: 65d4e5ffef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: Ia96136f5c3f44b8ead75c8d7d2c0ba1d5a27f577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:30:56 +00:00
Edgar Wang
fe601c0489
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524
am: 7ab5a44498
am: 94a7906033
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: Iaf9e24ca15aa94241c07db97c2b0d11881328e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:30:48 +00:00
Automerger Merge Worker
2a3e6630ae
Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524" into tm-d1-dev-plus-aosp am: 2de1730ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I33d0be2302813faf76949efdc869cdcb0eb7c296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:42 +00:00
Edgar Wang
65d4e5ffef
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 025baa318b
am: 0d22bf453d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I49d34f1b2f737217216096f0fbd9c6d6d46afb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:33 +00:00
Zhe Song
0f1f999c3f
Fix AVAILABLE constant to be search indexable for Enhanced Notification.
...
AVAILABLE = 0 means search indexable, rather than 1.
Deleting the line so that the correct definition in parent class BasePreferenceController will be used.
Test: make RunSettingsRoboTests
Change-Id: I315dcb51f46788dd167424aaeff09112b06590ff
Bug: b/232947022
2022-06-07 05:12:27 +00:00
Edgar Wang
94a7906033
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524
am: 7ab5a44498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I957fd8fde3ae1865148de0fdd7c6d32b9bb79217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:17 +00:00
Automerger Merge Worker
2de1730ca0
Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524" into tm-d1-dev-plus-aosp
2022-06-07 04:58:42 +00:00
Edgar Wang
0d22bf453d
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 025baa318b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I56e33ea1e76d0426f15816862464a81d36934848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:38 +00:00
Edgar Wang
f3883c5da8
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I264c15129aad5569e1d05e37940247c95ae4d07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:38 +00:00
Edgar Wang
7ab5a44498
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I3d2bdadb80d2a1189e8e7e69d883ac2f4763bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:36 +00:00
Edgar Wang
160d3af916
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: e7d6508284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: If4f5d9eb91c4e5f74747ba391caba5ea7351cdd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:57:57 +00:00
Automerger Merge Worker
881d38ba42
Merge changes from topic "am-038a028ec25548ecafb51d7e14eb8cbf" into tm-qpr-dev-plus-aosp am: a1a0499242
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 b51ae97810
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I0e841a8409bf01a73fa873487e2b3812bdf3f0f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:43:15 +00:00
TreeHugger Robot
53d5a5984b
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
-s ours am: 02dead7892
-s ours am: 572cfb7640
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I6d9fd10282d81fb3c775cc983cb9e3dc6be00030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:43:14 +00:00
TreeHugger Robot
4dfacddc1e
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
am: 303c6f3cac
-s ours am: 40472f831f
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I0463c0958548bfe7d161beabc574d71257f379e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:42:41 +00:00
Alice Kuo
d702cbb407
[automerger skipped] Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e
am: b8b79e0574
-s ours am: 9dbce75768
-s ours
...
am skip reason: Merged-In I2d650eb315790c3efc7510d9e125aeaf4464cda6 with SHA-1 b13abc03dd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740332
Change-Id: Id3c8afa16dc095b47132a7faa97063ae92baf460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:42:39 +00:00
Alice Kuo
1c9b82fb21
[automerger skipped] Add LE Audio feature switcher in the developer option menu am: 948b7cb959
am: b045c57fe6
-s ours am: df44228ece
-s ours
...
am skip reason: Merged-In I8adcf27edd1438df445d32fca93f35ff5020a3b3 with SHA-1 0d11fd07e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331
Change-Id: Id08bbd58047719954b58ebde2a2a68d13863cde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:42:38 +00:00
Edgar Wang
47b4c86524
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I0f6f87246effdc808b77726a0519d4b063ef4fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:41:48 +00:00
Edgar Wang
e7d6508284
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I11312c2633242bf780379ff4b66a72800afde31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:40:42 +00:00
Edgar Wang
025baa318b
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I831063be158b5097e3cc82e8d5db767676096811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:40:14 +00:00
Edgar Wang
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
Automerger Merge Worker
a1a0499242
Merge changes from topic "am-038a028ec25548ecafb51d7e14eb8cbf" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
-s ours am: 02dead7892
-s ours
[automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810
-s ours am: a6b2701416
-s ours
2022-06-07 04:15:20 +00:00
TreeHugger Robot
572cfb7640
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
-s ours am: 02dead7892
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I0b2c71b9fae7ed8417d0b696e41f80222d87f054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:15:15 +00:00
Alice Kuo
d9a4ef42cf
[automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810
-s ours am: a6b2701416
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: Ifaffa92a7a990552d068a8ba5dcc240fddf0e4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:15:14 +00:00
TreeHugger Robot
40472f831f
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
am: 303c6f3cac
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: Ic3f98ad45cbd9236e8287c0cf07cff507033a667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:15:11 +00:00
Alice Kuo
9dbce75768
[automerger skipped] Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e
am: b8b79e0574
-s ours
...
am skip reason: Merged-In I2d650eb315790c3efc7510d9e125aeaf4464cda6 with SHA-1 b13abc03dd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740332
Change-Id: Ib3a8ffcbab86e98d96392d3ae5a48d9b6820bfcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:15:10 +00:00
Alice Kuo
df44228ece
[automerger skipped] Add LE Audio feature switcher in the developer option menu am: 948b7cb959
am: b045c57fe6
-s ours
...
am skip reason: Merged-In I8adcf27edd1438df445d32fca93f35ff5020a3b3 with SHA-1 0d11fd07e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331
Change-Id: Ia8ff483a5dee22c85d04ad3884f7ffc1699e1533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:15:08 +00:00
TreeHugger Robot
303c6f3cac
Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I30105608cf552ec60582cb296179b9cd94b6d66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:25 +00:00
Alice Kuo
b8b79e0574
Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740332
Change-Id: I2200a81b0d63cc690b475e5eed43e6f3e9f49ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:24 +00:00
Alice Kuo
b045c57fe6
Add LE Audio feature switcher in the developer option menu am: 948b7cb959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331
Change-Id: Ia0fa92a5061bdb75a648dbb3d8db9fd2bcbdb1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:22 +00:00
TreeHugger Robot
02dead7892
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: If223945b3c668ab61fab6b15bbdf3ae171d41120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 03:59:02 +00:00
Alice Kuo
a6b2701416
[automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I2dc97c6056295200799541e7f3af964e915eaa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 03:59:00 +00:00
TreeHugger Robot
671c65235c
Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev
...
* changes:
Grey out LE audio offload switcher as LE audio isn't enabled/supported
Unify the LE audio string and refine the layout to put LE audio switch together
Add LE Audio feature switcher in the developer option menu
2022-06-07 03:37:21 +00:00
Menghan Li
d9f5550681
Merge "Setup ToggleColorInversionPreferenceFragment test infrastructure"
2022-06-07 03:21:15 +00:00
Menghan Li
76f7bae7db
Merge "Setup ToggleDaltonizerPreferenceFragment test infrastructure"
2022-06-07 03:21:02 +00:00
Alice Kuo
b51ae97810
Grey out LE audio offload switcher as LE audio isn't enabled/supported
...
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
Merged-In: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
(cherry picked from commit f71b2ea56e
)
2022-06-07 09:43:08 +08:00
Alice Kuo
ed1a79a97e
Unify the LE audio string and refine the layout to put LE audio switch together
...
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
Merged-In: I2d650eb315790c3efc7510d9e125aeaf4464cda6
(cherry picked from commit b13abc03dd
)
2022-06-07 09:39:25 +08:00