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
Jason Chiu
65cea8adf1
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
am: 89f5d2d442
am: 72087b36a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: Ia67faf2199f31b007d2ea8d94c966ce6636df6bd
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:31:21 +00:00
Jason Chiu
551f3e3f08
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
am: 89f5d2d442
am: 031dfc79a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: I8f3f346afddd365ac19c75f3113d23b1819dfeea
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:30:46 +00:00
Jason Chiu
b013b7537f
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
am: a9b11b0a64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: Ia7fbbd4c1a56eafe0f65258756adc9ef9bd66fae
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:09:20 +00:00
Jason Chiu
72087b36a2
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
am: 89f5d2d442
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: Ia498d88e3a2bb5226e5485786294b09e3b88031c
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:08:59 +00:00
Jason Chiu
031dfc79a9
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
am: 89f5d2d442
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: I0d3bb825b7f11c4763b3ad1762eb4edc07ecfc8b
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:08:58 +00:00
Jason Chiu
89f5d2d442
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: I6944c307eba807fc351a0acd404edac6ddd1e22b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:46:48 +00:00
Jason Chiu
a9b11b0a64
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: I58c3cd1c3ec201afea0b4189eeef6c2005780e8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:45:29 +00:00
SongFerng Wang
30da3bc6d3
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
am: 750359c7ef
am: d6eca69928
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I143150b808c1398d37d491c623db6c0ca6ed1291
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:30:08 +00:00
Automerger Merge Worker
e517c7eddd
Merge "Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: a3bb653569" into tm-d1-dev-plus-aosp am: f120d4bf24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I0f32b8d9400c45cea07c2ad9dd6c88dd7cefb104
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:29:53 +00:00
SongFerng Wang
d754a12f46
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
am: 78a9701de0
am: b0ea586112
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I0d6d8f561868d3a4571004f8de2b85310f80823f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:29:24 +00:00
Prabal Singh
a3f658f9d3
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: 888deb9328
am: 1d3cd1a563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I523395685c27845dbfd38b60c6d539426c4a689a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:29:09 +00:00
SongFerng Wang
aad4bc4177
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
am: 78a9701de0
am: 2f29b5be0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: If9952706ecf46a31ca6544ad5ae2f8173afbbc27
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:29:01 +00:00
Prabal Singh
24278ea0d7
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: 888deb9328
am: c771c8bf94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: Id1559aa87be9958b82e11395ec49df91baafe3c3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:28:46 +00:00
Jason Chiu
346a40a6f5
Merge "Relaunch the account page after removing a work account" into tm-dev
2022-04-25 08:28:43 +00:00
SongFerng Wang
2f29b5be0f
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
am: 78a9701de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I413c08fc365319302f5a5885c846523404e1f942
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:14:01 +00:00
SongFerng Wang
d6eca69928
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
am: 750359c7ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I8d13e3dfd1dd0122b9525615ae95b88c6edd6512
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:13:58 +00:00
Automerger Merge Worker
f120d4bf24
Merge "Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: a3bb653569" into tm-d1-dev-plus-aosp
2022-04-25 08:13:54 +00:00
Prabal Singh
c771c8bf94
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: 888deb9328
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: Ie60a5a246352930881c50774b61197ced7f7c5ce
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:13:53 +00:00
Prabal Singh
0a79e9f1ab
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: a3bb653569
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: Ia3e836063a7894b765c5291a65997d1364e3ee3e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:13:51 +00:00
SongFerng Wang
b0ea586112
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
am: 78a9701de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I0408fecf0662dbb71d5d2d29232d525226af96bd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:13:49 +00:00
Prabal Singh
1d3cd1a563
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: 888deb9328
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I33e6469fa714e28b1773ee4b1aac54dbf786e909
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:13:38 +00:00
SongFerng Wang
78a9701de0
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: I91a231d6c86a2f594feb5eb9604653247273e6ae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:49:45 +00:00
Prabal Singh
888deb9328
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: Ic3d77ecb6d22e632feefc75773b84e6d7da270c8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:49:38 +00:00
SongFerng Wang
750359c7ef
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: If727840e74fdc94efc05e9161c8662beca653ca6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:48:34 +00:00
Prabal Singh
a3bb653569
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I00659bd11958275081e038dbe67c8fb8481df96b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:48:19 +00:00
SongFerng Wang
564c88485a
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev
2022-04-25 07:40:43 +00:00
Jason Chiu
880471a1b0
Renew the highlight state color
...
Fix: 230283855
Test: visual
Change-Id: I725422518d07a0b0676731bd9da8384ab149ab1b
2022-04-25 15:34:42 +08:00
Prabal Singh
591c2c3b38
Merge "Use settingslib util methods for work policy info" into tm-dev
2022-04-25 07:33:09 +00:00
Jack Yu
bf3a207fb5
Change the alignment of the foreground preferernce controller
...
Set left align to the nfc foreground preference controller.
Bug: 223073535
Test: manual
Change-Id: I0d4ffcedb2646b9d3fd7f4d56adb0d000cfd5987
2022-04-25 15:27:05 +08:00
Arc Wang
0b2dd10d5c
Fix 'Documents & other' missing problem am: 03b1b23c74
am: a3b164bcc4
am: a72a931706
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I4deb1bbcf08b927a9886c297953b7f64114dae97
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:40:27 +00:00
Jason Chiu
9c1a1cb884
Relaunch the account page after removing a work account
...
Removing a work account goes back the previous page.
However, this closes Settings app in dual pane mode since the account
page is in the 2nd layer.
Bug: 223755141
Test: manual, robotest
Change-Id: I40407cb052c0474f62254bcb2216e33496c901c8
2022-04-25 12:39:51 +08:00
Arc Wang
d49aca5cc1
Fix 'Documents & other' missing problem am: 03b1b23c74
am: a3b164bcc4
am: e75da8d5a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I083457746ef286691f0ad64f7a2ae6ff70e36025
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:26:40 +00:00
Arc Wang
0290122498
Fix 'Documents & other' missing problem am: 03b1b23c74
am: 7cd842e9c9
am: 4ddd53cb30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: Ib6693bd99362ccba552a8356883cbd82718cbac4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:26:14 +00:00
Arc Wang
e75da8d5a8
Fix 'Documents & other' missing problem am: 03b1b23c74
am: a3b164bcc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: If92d0741c7510ddbe749286168600e3a8941edc2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:18:09 +00:00
Arc Wang
a72a931706
Fix 'Documents & other' missing problem am: 03b1b23c74
am: a3b164bcc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I662f75beb94a6e75c3208f9098e9027d4f71cf07
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:18:05 +00:00
Arc Wang
4ddd53cb30
Fix 'Documents & other' missing problem am: 03b1b23c74
am: 7cd842e9c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I476db3eb6c58d390a01061582a2ab1b849bacb20
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:11:01 +00:00
Arc Wang
a3b164bcc4
Fix 'Documents & other' missing problem am: 03b1b23c74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: Ibe6da087880153d6da8e3ab4827768300f4a1076
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:00 +00:00
Arc Wang
7cd842e9c9
Fix 'Documents & other' missing problem am: 03b1b23c74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I846b255fa2e88e16c92799ad6e6f63cb8ddbbb9b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:52:33 +00:00
changbetty
d1d9798a5d
[LE Audio] Add entry point in Media Volume slice for broadcast sink
...
Bug: 228274114
Test: make RunSettingsRoboTests
Test: Manual test
Change-Id: I331232c30291348faf7166d4de8060a1cfe12bff
2022-04-25 02:42:46 +00:00