Bill Yi
a0048fb9cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930029
Change-Id: I9acc40bf6a14fcfad9eecf3d49fccd3b1af17611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 03:51:12 +00:00
Bill Yi
ac0f2ae37e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930029
Change-Id: I3d774a5c9d3d9cd074e24f25699919a2e7c49029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:55:55 +00:00
TreeHugger Robot
615c81031b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I7e652e354e8e2a0b33ea134c34ebe40e663b4abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:44:04 +00:00
Bill Yi
9f8abb6e53
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: c2b193716b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Id02bef93154d022f94a157a265bfd571ee4d96dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:43:45 +00:00
TreeHugger Robot
68baeb6c08
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Ib725f85d75107fb77d15ca36dfdc6649b5b4fc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:21:53 +00:00
Bill Yi
c2b193716b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Ifd94b87dafc48430f7abe71ac6aa67e457157e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:21:36 +00:00
TreeHugger Robot
dfd4ecad02
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: be39eb0ad1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I50a6a6e575604dede9320f3544d948d77888dae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:03:18 +00:00
TreeHugger Robot
1f6b29b35a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I4907deaeaf6cf14c6f22f8ee58036ca33e7782ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:59:23 +00:00
Bill Yi
7146184316
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Id264da7161d5c6f04fcbc948596e8b2c376047f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:58:57 +00:00
TreeHugger Robot
be39eb0ad1
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I20de3cac557981cbf0ace509d1fcd51ee4244e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:41:33 +00:00
TreeHugger Robot
3e8135ea74
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-27 00:39:28 +00:00
TreeHugger Robot
a72b9398fb
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev
2022-04-26 23:45:12 +00:00
Bill Yi
e482bd0e01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I4643295f3b99d56bc6010788f0e56df5bad948c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:27:10 +00:00
Bill Yi
82c384c62d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: Ie1be6ac08814cb197fe6ccfe5c82a84e92cc0ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:10:39 +00:00
Bill Yi
fa497ab8af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I37b7ef953f06dedbfd1aae0f3c75ae9f3f86daa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:01:50 +00:00
William Leshner
ed5ba9a647
Merge "Disable screen saver setting for non-system users." into tm-qpr-dev
2022-04-26 18:16:57 +00:00
Bonian Chen
a28e63c502
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: bad5635b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: I9ade4e92571b1d10f2abcf6b161c670a2b33713b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:43:01 +00:00
Bonian Chen
13ae7a955c
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: e8619c8d08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597
Change-Id: Id300a894ede7308c77a2ef39848d20485c907289
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:42:41 +00:00
Bonian Chen
bad5635b38
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: Iee91e59319e1003f6bea8258ed4de08fff75e942
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:35:59 +00:00
Bonian Chen
e8619c8d08
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597
Change-Id: I7afa87de1ae7ec6d271dec993794a8c7295195f6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:35:52 +00:00
Jason Hsu
448ecc09ad
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: 2fc065c351
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: I78091edeaf8056f515f2e8bf882f272282985793
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:34:54 +00:00
Bonian Chen
73c8e2f45a
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev
2022-04-26 10:25:31 +00:00
Bonian Chen
3fc05a917e
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev
2022-04-26 10:25:02 +00:00
Jason Hsu
2fc065c351
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: If7c97872d17ba3a0e4454d1b9f30b520cbbd81db
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 09:02:58 +00:00
SongFerng Wang
d2afbdfb43
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 45d498e411
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395
Change-Id: I2ae4ff37756ea1c1aaa3432496a4c8147024a857
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 08:30:50 +00:00
Jason Hsu
12c10cfa5c
Merge "Correct Magnification shortcut title" into tm-dev
2022-04-26 08:07:37 +00:00
SongFerng Wang
45d498e411
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395
Change-Id: Ib83808167690f7b67cef48ef53764a1f7e500897
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 08:02:48 +00:00
SongFerng Wang
1bc142776c
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev
2022-04-26 07:36:28 +00:00
Chaohui Wang
d1573cd417
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I88d0995852b1864a6ce85d2b304bcc7084d444f4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:27:28 +00:00
Chaohui Wang
61a35e7b85
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I71d0c09c5c1419f48bd3dd754eeaafa1acbf17f7
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:52:31 +00:00
Chaohui Wang
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +00:00
Jason Chiu
163ee46ef0
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: I8a1ca0ab86930c57f64fbb9d712ec4b449b530bf
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:28:03 +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
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
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
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
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
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
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
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
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
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
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