Commit Graph

111124 Commits

Author SHA1 Message Date
Automerger Merge Worker
8325500238 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours" into tm-d1-dev-plus-aosp am: 2775ad9caa -s ours am: 1a935b1953 -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: Id9b06a1d580d122ca5fe13f0a64e1a5190e104be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:35:37 +00:00
Bill Yi
5d74ca40f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: 2b0376c226 -s ours am: 5e0ce2dca3 -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: Iee9ecfcb9ec8d1c04c1ee81dbdd1cfbb53791e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:35:20 +00:00
Bill Yi
8a4d954d9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 131903dd2e -s ours am: 17fe543e54 -s ours am: a1ae687480 -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: I3571b9c2621ee3c879ff7a4257de707af331f433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:28:05 +00:00
Avinash Vadlamudi
73daf8510f Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221 am: 1ed3556c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036

Change-Id: I8f024e7a0a13a07357082d78f015ecfa696b9d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:26:05 +00:00
Automerger Merge Worker
1a935b1953 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours" into tm-d1-dev-plus-aosp am: 2775ad9caa -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: I3b7720ae178ab43f99349ed75368fdcf157e76ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:22:32 +00:00
Bill Yi
5e0ce2dca3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: 2b0376c226 -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: I2c8e880853e6f9cde41103f0a3a5945305a63977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:22:10 +00:00
Bill Yi
c6c0a33d9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: c4a1f97025 -s ours am: 6d96a79850 -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: I82cb7f56ac155628fd427d215d3ae60f35d7a9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:16:59 +00:00
Bill Yi
a1ae687480 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 131903dd2e -s ours am: 17fe543e54 -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: I89901a3b8ec9d062e0cbca00a8a48d52e172b362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:14:42 +00:00
Avinash Vadlamudi
1ed3556c63 Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036

Change-Id: I1a0e8f88302132e700c9f07b802f44e412ceae1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:12:18 +00:00
Avinash Vadlamudi
26e3744221 Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
* changes:
  Rename method for better readability
  Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
Bill Yi
6d96a79850 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: c4a1f97025 -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: I48b082d485ba11bd56a8a469d1c430dcc392044f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:57:31 +00:00
Automerger Merge Worker
2775ad9caa Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours" into tm-d1-dev-plus-aosp 2022-06-08 03:50:41 +00:00
Bill Yi
42420e4d1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 04b439f643 -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: I899a973f1062c659608173ba8d393cb67573239c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:49:30 +00:00
Bill Yi
2b0376c226 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -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: I3ce5bb254a6c4d9244c2f29c3a6ad59587438753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:49 +00:00
Bill Yi
17fe543e54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 131903dd2e -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: Ib4af0ce054ac96742875fcd2df1a28d163e691dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:41 +00:00
Bill Yi
c4a1f97025 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -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: Ic7cf3d05fe64e8e19bfc950365e3d210155a76dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:30 +00:00
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