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
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
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
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
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
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
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
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
Joshua McCloskey
d3001a1a01
Fix final UDFPS enrollment haptic.
...
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes 229804277
Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
2022-04-22 21:06:21 +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
c2a243d18e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef
-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: I99d292630bcfbd5889c08c643fc86668af23c2c0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 19:21:01 +00:00
Bill Yi
a677c158cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d
-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: I55f07f8d0ba4b3266573f76b7b96384248566626
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 19:20:34 +00:00
TreeHugger Robot
5cbf83555b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845818
Change-Id: I79d31ce9d982d951446f2cb5fb3fdf99e493105c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 19:20:11 +00:00
Bill Yi
4b425d20e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845818
Change-Id: Ie5f16a932cfe36d923f82a9d582eef544e490a71
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 19:19:50 +00:00
TreeHugger Robot
3624b9a2ef
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-22 18:56:18 +00:00
TreeHugger Robot
7a6e5d0b0b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-22 18:56:18 +00:00
Ricky Wai
f3ed6ffb04
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
am: 8f61acd8c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: I63d21313f123db06ce3c70e8e2bfb8429f3e531e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:45:10 +00:00
Ricky Wai
1a574d518b
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
am: e2edfe3235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: I71ce8388f0b3bba551896b8869e445f095b53eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:19:35 +00:00
Ricky Wai
8f61acd8c2
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: I8342a30b9e86699fcce7f8f5858572def92c30ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:18:58 +00: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
Bonian Chen
aeac0619df
[Settings] Code refactor for combining TelephonyCallback with Lifecycle
...
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.
Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
(cherry picked from commit 7c5259efad
)
2022-04-22 10:39:04 +00:00
Automerger Merge Worker
aa2ed50e34
Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours am: 5c7d0155a8
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours am: e74c40fc84
-s ours
2022-04-22 08:30:32 +00:00
TreeHugger Robot
69acf57ed4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours am: 5c7d0155a8
-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: Ie819eb7ee6d278600746aa2abf460c719dca40fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:29:31 +00:00
Bill Yi
f319170f36
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours am: e74c40fc84
-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: Ib856ed06b9c04dcde4046f203421e9dad8004561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:29:12 +00:00
TreeHugger Robot
45f2cc4a18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours am: 46f1b16545
-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: I9debab53eab77d49cfad8fbc16478a641a5baa5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:28:43 +00:00
Bill Yi
8e7b0e6168
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours am: 2affff9747
-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: I3972d0ebabf19df58ae5abc285e03d081f78e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:28:26 +00:00
Bill Yi
2fbc122a96
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours am: 896ea5769a
-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: I372cea0699af4aba561966f122f4c30b3cb1cbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:22:05 +00:00
Bill Yi
c55eab5de8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours am: de73de0c47
-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: Ibbd3890ea2856cf551ca35806385ec3e61339c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:21:38 +00:00