SongFerng Wang
a7a5061f08
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: Iaea308bce7c671764a8a8922cd7559849f253d5b
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:48 +00:00
Prabal Singh
9fa00378f7
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: I367725b607bc93181341a14a06d376ef50f59521
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:39 +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
74c1725d99
Fix 'Documents & other' missing problem am: 03b1b23c74
am: a3b164bcc4
am: a72a931706
am: 0b2dd10d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I7ce55b3a1b0b9ef8a6b192077fd2ec69f1aa2942
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:49:30 +00:00
Arc Wang
33a5671314
Fix 'Documents & other' missing problem am: 03b1b23c74
am: a3b164bcc4
am: e75da8d5a8
am: d49aca5cc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I8e2a61ab0d44a4eeee173b93afaeb46fe58bba84
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:49:02 +00:00
Arc Wang
b29a16474b
Fix 'Documents & other' missing problem am: 03b1b23c74
am: 7cd842e9c9
am: 4ddd53cb30
am: 0290122498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I578ba6654aeba3ff9fa997c829a00198e2a200ee
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:48:31 +00: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
c7a8598318
Fix 'Documents & other' missing problem am: 03b1b23c74
am: fec02dd404
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I97a38a37cc3d5e986197ea802ba4f75b0e70e509
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:10:32 +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
fec02dd404
Fix 'Documents & other' missing problem am: 03b1b23c74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I5cd5ff4c3c8a5a00a9e286d6f831c82812f91366
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:53:06 +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
jasonwshsu
e48ebb9755
Correct Magnification shortcut title
...
Root Cause: Magnification has its own ShortcutPreference, but we did not
update correct title with getShortcutTitle()
Solution: Call setTitle(getShortcutTitle()) in initShortcutPreference()
Bug: 228752572
Test: manual test
Change-Id: I85b09a22032bad0a0c840590a98be88538a0499b
2022-04-25 02:53:15 +08:00
Bill Yi
0c2f84941f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9751d68c866e0a2d4fb7875884e506a0406c24e5
2022-04-24 11:07:35 +00:00
Bill Yi
35705d94c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f7b9a0d0a9e6a46aa83fb414c35f71012b80d86
2022-04-24 10:59:49 +00:00
Bill Yi
3f51a847ff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5d11353374e71949e9ef2300c55c90958c2cb06
2022-04-24 09:15:34 +00:00
Bill Yi
aaa5c995b4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I281c7a22ec286bafd8776557ec99bf5d93ee72f2
2022-04-24 09:06:06 +00:00
Bill Yi
12b3ef3439
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ief5d8f3856cfe12f42c4cb151058207607e1c575
2022-04-24 08:59:20 +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
Bonian Chen
4a86eb3fcc
Merge "[Settings] Fix flaky presubmit failure"
2022-04-24 02:01:12 +00:00
Bill Yi
d57e7b8b51
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: eec01885fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838200
Change-Id: Ib45a6f4e01c41bdbe4971658c84f4c1f2171ec84
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:16:01 +00:00
Bill Yi
94d7904bf9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aabc1c3bf6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838200
Change-Id: I01ec44cbd2614c9527ecdb6e4fed55acabef408d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:15:43 +00:00
Bill Yi
587f38be4d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f5ea12c99d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838198
Change-Id: I659f9566c999001f5634a0fe107d2907d298be2e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:15:25 +00:00
Bill Yi
940a16b235
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7a0cf680
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838198
Change-Id: If9902f023ba4d339dbf4359deabf120a96bdb576
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:15:10 +00:00
Bill Yi
eec01885fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:53 +00:00
Bill Yi
f5ea12c99d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:53 +00:00
Treehugger Robot
a556770d2f
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb
am: 08f97c9bc0
am: 7191d7d09d
am: 97d9c0fd07
am: 3ff1c69be2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: I74041b444fe978b9e15044ea982e38eb1e3f32ce
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 21:01:19 +00:00
Treehugger Robot
3ff1c69be2
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb
am: 08f97c9bc0
am: 7191d7d09d
am: 97d9c0fd07
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: I61eaf88879353c3847e6049e5736277a35213905
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 20:45:09 +00:00
Treehugger Robot
97d9c0fd07
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb
am: 08f97c9bc0
am: 7191d7d09d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: Ia710b1bd651880e0dddc39f6cb41d168c18c96ee
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 20:20:58 +00: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
Bonian Chen
cc7474d50d
[Settings] Fix flaky presubmit failure
...
Bug: 229689535
Test: unit test
Change-Id: I0fc193d6f34cfff13d15487ad0c1f646f67d4c97
2022-04-23 17:53:14 +00:00
Will
640247eb58
Disable screen saver setting for non-system users.
...
On devices where non-system users are not allowed to dream, disable the
screen saver setting when the current user is not the system user.
Bug: 213906883
Test: atest ScreenSaverPreferenceControllerTest
Test: Manually with the following steps:
Step 1: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser set to false, make sure that
non-system users can still access the screen saver setting.
Step 2: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser setting is set to true, make sure
that non-system users can not access (or see) the screen saver setting.
Step 3: Make sure that system users can still see the screen saver
setting on a device where config_dreamsOnlyEnabledForSystemUser is set
to true.
Change-Id: I7e167ed5a1ea183c725ba89a57b8d0b372064b82
2022-04-22 16:03:31 -07:00
TreeHugger Robot
6585a18362
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-04-22 22:29:26 +00:00
TreeHugger Robot
642cacec6a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-04-22 22:29:26 +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
TreeHugger Robot
b2308b060d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef
-s ours am: 32f8460aac
-s ours am: d3cba01021
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846023
Change-Id: If75a5eee9eaafbe782c9f0661f26c0d798af0abb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 20:50:56 +00:00