Chaohui Wang
6dc65f1eb4
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: Iea7bef3ceebeb17a54314389a1314a378d383d5c
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:51:16 +00:00
Chaohui Wang
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +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
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
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
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
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
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
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
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
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
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
Arc Wang
03b1b23c74
Fix 'Documents & other' missing problem
...
Should check if 'Documents & other' is visible
when mVolume is updated.
Bug: 230215783
Test: manual visual
Settings -> Storage
Change-Id: Ife36b71bee66ff16802e352785824e10c17dceb8
2022-04-24 15:30:16 +08:00
Treehugger Robot
7191d7d09d
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: I016b3fa9032e278a9d88b842b0e72f460b71d6c6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 19:56:36 +00:00
Treehugger Robot
08f97c9bc0
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: Iec813ee718cda4e6d0bd5a32ec6a2af9a136cfaa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 19:38:41 +00:00
Prabal Singh
67007e5933
Use settingslib util methods for work policy info
...
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
Treehugger Robot
0edc7fb3cb
Merge "Update OWNERS file for enterprise modules in Settings"
2022-04-23 18:55:44 +00:00
Nate Myren
d1749cfbab
Allow intent into Privacy Controls page
...
Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
2022-04-22 13:58:50 -07:00
Ricky Wai
e2edfe3235
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: Ic4f104b59e2fceb3e8d949bb8c6402abd51c2a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:17:55 +00:00
Ricky Wai
fd7153ed39
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev
2022-04-22 14:53:00 +00:00
SongFerngWang
b76feffe4f
Gray out the network mode UI before the carrier config is ready
...
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
TreeHugger Robot
46f1b16545
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I21c5b9f71dcba7f7eb9a394b8f9bd7fad1aa920d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:00:57 +00:00
Bill Yi
2affff9747
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Icd45906eb216359a6235529f1ac58ca594d8384a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:00:41 +00:00
Bill Yi
896ea5769a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I89a39ec5b73a75bcac87834ec4aff57b4f44b557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:54:21 +00:00
Bill Yi
de73de0c47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: Ia981adacd8291bf34a0cdd7efe50efe4dc19798a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:54 +00:00
Bill Yi
9ea6d0e609
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I5464636ed72692b8443643142e9fe58e45221888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:34 +00:00
Bill Yi
8c88568430
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I4edc606820da1429054292718c70341fc122cb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:18 +00:00
TreeHugger Robot
7d5cc42c81
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Id2024b4c9ab3d5bc9efd2985847f0396112ef464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:52:28 +00:00
Bill Yi
f1b797ac9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I1d0c3fd484331c7cd7e1d55106fd1c89c67da57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:52:01 +00:00
TreeHugger Robot
21a233b016
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: I9ce1f767afec1b5d10e0e4520fd3cc1a4d936ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:51:06 +00:00
Bill Yi
bfd3ced372
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
Bill Yi
3ec36ec5c1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
TreeHugger Robot
49cc66afd3
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev
2022-04-22 05:50:05 +00:00
TreeHugger Robot
226baf6f25
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-22 03:59:00 +00:00
Chaohui Wang
1dd8117b21
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: Ib5d994aa207584d817e4a06036727edb1113d47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:34:27 +00:00
Stanley Wang
1f2337d627
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: Id91cf96b271c50600936e35c39cddafc10b8d33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:34:14 +00:00
Chaohui Wang
932d5deaff
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev
2022-04-22 02:15:23 +00:00