Automerger Merge Worker
d53e79d292
Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp
2022-04-26 06:28:02 +00:00
TreeHugger Robot
7ba258ee83
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: Ie95b750091bf22ac690c73ebb49d63c906e047c2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:27:59 +00:00
TreeHugger Robot
81f281b6dc
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: I955609258cbd7ab4faeaa0748a13e55fff2e5a03
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:27:59 +00:00
TreeHugger Robot
4837d34fab
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: I7f2a5fc92011f20591e51ce2e64ff4255d9d9c23
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:27:57 +00:00
Jason Chiu
b174c6853e
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: Ia100a0ee19b88d603887cad11b1849d1a5b9d2cd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:12:57 +00:00
TreeHugger Robot
5f3059ff3e
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: Ice45d444bedfecaad34cce27fedd38528cd5ab91
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:12:49 +00:00
Jason Chiu
5fe986be58
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: I227ce218c0b7096412012ec04c356fa60e908882
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:11:40 +00:00
TreeHugger Robot
734ada269b
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: I5e3948fb746aa2eb485cc0a2113f9f06a4ed234f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:11:31 +00:00
Jason Chiu
81ee2037ed
Merge "Renew the highlight state color" into tm-dev
2022-04-26 06:08:40 +00:00
TreeHugger Robot
5a083d2bfe
Merge "Change the alignment of the foreground preferernce controller" into tm-dev
2022-04-26 05:44:37 +00:00
Joshua Mccloskey
b44da73e77
Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: eb4fa99d5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796
Change-Id: I950af7978c4af50afbcde4d59395780973762764
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 22:00:36 +00:00
Joshua Mccloskey
872c5b533c
Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796
Change-Id: I67b2e8a129697483bd0f0a410284efb9a61fdb5f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 22:00:21 +00:00
Joshua Mccloskey
eb4fa99d5a
Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796
Change-Id: I6d5b095918d499447fa67f2e0ac2b28345885e32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 21:37:30 +00:00
Joshua Mccloskey
0a41ad016f
Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796
Change-Id: Ia50eaa82757cb61f1851bfa7c5e352646076162f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 21:37:13 +00:00
Joshua Mccloskey
e7c507070d
Merge "Modified Fp -> Face setup flow" into tm-d1-dev
2022-04-25 21:14:39 +00:00
TreeHugger Robot
c0d3713453
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 am: 3f5a3ce250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: I9a037d94d134ee9d61bfd71f8e65cac02ff00f0c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 19:16:00 +00:00
TreeHugger Robot
de8bff5446
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: 7e8278e3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: I6d00f1859f76d2715771c9b49d9d1b66fe736774
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 19:15:47 +00:00
TreeHugger Robot
394c83c085
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: bc6d056015
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: I94e6a462619de1b26c9e1fe8d357913139782823
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 19:15:37 +00:00
TreeHugger Robot
3f5a3ce250
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: Ic0825c41a3879402d05a27bdffa48678143361aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 18:59:07 +00:00
TreeHugger Robot
bc6d056015
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: Ic3ea00d800f8baf0432d10be1900245a5749393d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 18:59:00 +00:00
TreeHugger Robot
7e8278e3cc
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: Id1d714a163113bebcc44243be6f75330b6312039
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 18:58:57 +00:00
Ben Murdoch
cab2b2c4d0
Fix NPE in Bluetooth Settings.
...
Bug: 230347816
Test: Manual
Change-Id: I210ce81217466897c59509a31fb53d57eed71118
2022-04-25 18:40:54 +00:00
TreeHugger Robot
09c7795dfa
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: I7b6f267436a95259a68e1cfcc7be3545e83e49e1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 18:36:52 +00:00
TreeHugger Robot
6abf8e2f78
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: I1931a6139fd93fe5781a1743b695a36ddc0c8579
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 18:35:50 +00:00
TreeHugger Robot
5d218d9fa4
Merge "Allow intent into Privacy Controls page" into tm-dev
2022-04-25 18:09:39 +00:00
Jason Chang
f38cec326a
Fix the description of one-handed mode doesn't change immediately in
...
Gestures page after users turn on/off in Quick Settings
Add ContentObserver URI for observing when settings key
"one_handed_mode_enabled" changes.
Bug: 230041450
Test: manually verified on System > Gestures >
One-handed mode item when turned on/off in Quick Settings
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.
OneHandedEnablePreferenceControllerTest"
Change-Id: Id6bb53692181dfc3c8a1006017b5a22462dc4ad9
2022-04-26 01:50:43 +08:00
Lais Andrade
cc8790f7b3
Create separate On/Off string resources for Vibration & haptics
...
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.
This change separates this resource string from the more generic one
that was used before to allow this flexible translation.
Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
2022-04-25 17:15:39 +01:00
Jan Tomljanovic
1e9e82e937
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: cfd80d65f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: Ica692daa7426b5b58126b29dd9f8c71f7ee84272
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 15:14:04 +00:00
Jan Tomljanovic
973ad536c8
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04 am: d6c1353a80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: Ic6e6d1654463ef13c352eb3b959f1593077a790b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 15:12:55 +00:00
Jan Tomljanovic
df90e9b05f
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: 66d62cb61e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I8d019b8af584bc5df1ee4c7d9d315a19e4703050
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 15:12:43 +00:00
Jan Tomljanovic
66d62cb61e
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I85990569eb583b2ca2df96eca5a536ecfdc6bdbc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 14:57:45 +00:00
Jan Tomljanovic
cfd80d65f0
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I45d7b7dcd48b82d68d80ad72bfa1619ffec831b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 14:57:24 +00:00
Jan Tomljanovic
d6c1353a80
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I66d3322cdc54151f685d31fa71caa0bfeacd0ff3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 14:57:20 +00:00
Jan Tomljanovic
2a9fb8aa47
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I6b8ae6593ba12751b4eb2be7cea75256e18638a9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 14:23:57 +00:00
Jan Tomljanovic
a474c51a04
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I070dae172e3998101c04bc58edccf3aed262840b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 14:23:05 +00:00
Jan Tomljanovic
e22fa138aa
Merge "Don't show back arrow in Security when in split mode." into tm-dev
2022-04-25 13:52:31 +00:00
SongFerngWang
e5fff060a2
[MEP] show the DSDS mode selection dialog for user when user insert esim
...
If device has esim, then user inserts esim in SS mode. Then, UI should show
the DSDS mode selection dialog for user.
Bug: 230050990
Test: build pass and manual test.
Change-Id: Ia4e695ae2c4e86d6039e03738378989a0879cc71
2022-04-25 21:07:26 +08:00
Betty Chang
1049bce891
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: 21b9bb97d9 am: 0027d94245
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Ia59e388cc2af3f37a47e67b29dd458985cd86a20
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 11:21:57 +00:00
Automerger Merge Worker
3fbe1e0568
Merge "Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 4f1eb41a64" into tm-qpr-dev-plus-aosp
2022-04-25 11:21:42 +00:00
Betty Chang
0c49f4fa63
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 4f1eb41a64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: I5fd3503f8981bac2571efad3a159f6936bb3f583
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 11:21:37 +00:00
Betty Chang
b350f15a60
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 571ef48801
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Ic8639e21713f73bea95210c1259d755751c9973b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 11:21:26 +00:00
Chaohui Wang
f250493787
Update Personal / work selection UI.
...
Implement the new-look by using AlertDialog's
custom title and custom view.
Using the RecyclerView so we can display profile
horizontally.
Bug: 174626616
Test: manual & robolectric
Change-Id: I9f5a7685d9217fc62e01799ad73f9b9a3ddbf19a
2022-04-25 19:12:38 +08:00
Betty Chang
571ef48801
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Ib1cf8d4fbfeaee40c46574d995c112341bdb3b5a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 11:03:52 +00:00
Betty Chang
0027d94245
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: 21b9bb97d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Ibc05a54d837f9f0dceea1a98da008d2783fb2214
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 10:59:57 +00:00
Betty Chang
4f1eb41a64
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: I26da3e88b049a891f153f0c92abc9c208bf16fba
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 10:58:10 +00:00
Betty Chang
af1e12cf26
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Ieb87da91f486efe72ef5cff43aa99982e8ad9f9f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 10:57:16 +00:00
Betty Chang
21b9bb97d9
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Ieba054b1692260cee393b2b18554de4fe31df46f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 10:55:51 +00:00
Betty Chang
662a45bc0a
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev
2022-04-25 10:39:42 +00:00
Jan Tomljanovic
ef817325bc
Don't show back arrow in Security when in split mode.
...
Test: manual
Bug: 224427042
Change-Id: I0b0daa3981c56ba99bebda2cd34a51f3877f37a6
2022-04-25 10:37:55 +01:00
Jason Chiu
fd1dd3b62b
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: a9b11b0a64 am: b013b7537f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: Iea125629b94ee71fc55243c54fc9dca4f2be8612
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 09:32:17 +00:00