Kholoud Mohamed
a95a9154fa
Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class"
2022-03-29 11:01:21 +00:00
Chaohui Wang
f86a15362a
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev am: b94c0ab44e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397182
Change-Id: Ifb118af9849109abb3ec164716eed903ef6957a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 10:52:53 +00:00
Chaohui Wang
b94c0ab44e
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev
2022-03-29 10:36:31 +00:00
Josh Hou
57af174e45
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile"
2022-03-29 08:48:00 +00:00
TreeHugger Robot
0efaf46546
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev am: 670016a2ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17379163
Change-Id: I3c032ade902dac1b30bdff1f0a029a9fc382af41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 07:03:34 +00:00
TreeHugger Robot
670016a2ee
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev
2022-03-29 06:33:46 +00:00
Bonian Chen
3df6924591
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev
2022-03-29 04:50:20 +00:00
Chaohui Wang
9d8603568d
Fix "Automatically sync app data" button state not changed
...
This issue is caused by mPreference is null.
(Not recovered when the fragment is recreated after configuration change.)
Mimic the PreferenceDialogFragmentCompat.getPreference() in AndroidX to
solve this issue.
https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java;l=176;drc=ca9feb3b73769089afbfd36b4d4a3d91239f9cd5
Ideally in the long term, we could use PreferenceDialogFragmentCompat
instead.
Fix: 218754949
Test: robotest & manual
Change-Id: I7fc8dd3b771aa45c91f915e25c8cc6c6afdd8d63
2022-03-29 12:32:23 +08:00
Josh Hou
3550064e2e
[Panlingual] Fix the app language is shown incorrectly in the work profile
...
The root cause is that the context corresponding to the specified
profile Id is not correctly used when using LocaleManager to query the
app language.
Bug: 222769707
Test: Verify the issue by using the steps provided in the bug
Change-Id: Ic1f9e4cc9e90f5aecfa5e1094184aa63f3d94ffb
2022-03-29 12:00:13 +08:00
Tom Hsu
9541f70a80
Merge "[Panlingual] Improve and refactor revamped UI"
2022-03-29 03:34:31 +00:00
tom hsu
ded10f8e24
[Panlingual] Improve and refactor revamped UI
...
- Remove useless file
- Make Icon be able to scroll up and down
Bug: 226350483
Test: local test
Change-Id: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
2022-03-28 17:13:04 +08:00
TreeHugger Robot
e5cb2a170a
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177
Change-Id: I80be1a5786880a4b85ccad6b3444675d9e3cf026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:59:35 +00:00
TreeHugger Robot
5fd1f8fe4e
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev
2022-03-28 08:43:23 +00:00
Giulio Fiscella
a493ed6f75
Merge "Use migrated severity levels" into tm-dev
2022-03-28 08:38:47 +00:00
Giulio Fiscella
362f0abf6d
Merge changes from topic "scAPItm"
...
* changes:
[automerge] Use migrated severity levels 2p: 2a775c69fc 2p: b5446ce437
[automerge] Use migrated severity levels 2p: 2a775c69fc
Use migrated severity levels
2022-03-28 08:38:47 +00:00
Menghan Li
7325d18d30
Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586
Change-Id: I3e7576cc35c3088957d2976726c14971bf9defe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:06:25 +00:00
Menghan Li
c122879474
Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev
2022-03-28 06:43:20 +00:00
menghanli
917ab11ed1
Fix Caption preview SubtitleView textSize cannot update correctly
...
Root caue: When received #OnLayoutChangeListener callback, the mPainText size keeps "zero" after called setTextSize() because the requestLayout() does not trigger the whole view re-measure & re-layout in not ui thread.
Solution: Post #refreshPreviewText to ui thread to get correct bounds to
measure & layout.
Bug: 223696269
Bug: 211178478
Test: Manually test
Change-Id: Idcbeba52876171e5f3641eafc77d203764c78788
2022-03-28 12:30:29 +08:00
Joshua Mccloskey
6d0a1b8e5c
Merge "Only play fp vibration if accessibility is enabled." into tm-dev am: 566b8e5ab2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17315311
Change-Id: I7dacad381cabaea1280e0710c5c56696237309ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:07:30 +00:00
Quang Luong
01e66ca398
Merge "Increase WifiEntryPreference summary max lines for verbose logging" into tm-dev am: 8a5e6be37a am: e031563cf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390718
Change-Id: Idb43e2757aa80549a33e52001ae23de033988ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:06:27 +00:00
Joshua Mccloskey
566b8e5ab2
Merge "Only play fp vibration if accessibility is enabled." into tm-dev
2022-03-25 17:03:20 +00:00
PETER LIANG
199c83b9fc
Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev am: d4cd689c8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17166624
Change-Id: I2d340008e2f75efd9b4c5f3398e133569139b70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 16:53:02 +00:00
Quang Luong
8a5e6be37a
Merge "Increase WifiEntryPreference summary max lines for verbose logging" into tm-dev
2022-03-25 15:50:04 +00:00
PETER LIANG
d4cd689c8f
Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev
2022-03-25 14:06:00 +00:00
Baligh Uddin
cf5300d19b
Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev am: 1d788a0ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17383907
Change-Id: I14d11698280f310ec6b2fdf768d4114a81118ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 13:50:15 +00:00
Weng Su
876f691377
Restrict secondary users to share Wi-Fi network
...
- Remove "Share" and "Forget" options from the long press menu
- Rollback the Wi-Fi details restriction for admin user only
- Add SafetyNet Logging for security report
Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkProviderSettingsTest
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
2022-03-25 13:49:43 +00:00
Baligh Uddin
1d788a0ada
Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev
2022-03-25 13:12:10 +00:00
kholoud mohamed
90afe190e8
RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
...
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
(cherry picked from commit de78149c16 )
Merged-In: I4775d7741c7819fd811c3fc4eda1636b1e04b398
2022-03-25 11:38:34 +00:00
TreeHugger Robot
24302ff926
Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev am: 727583b75f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374493
Change-Id: Ibb0829e36d7404724927ce0c04b9632d550cea4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:04:17 +00:00
TreeHugger Robot
727583b75f
Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev
2022-03-25 08:40:57 +00:00
Jenhou (Alan) Huang
f7b69b7c58
Merge "Fix group cast volume slider not disabled after switching to group devices." into tm-dev am: e94f159054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17351353
Change-Id: Ib4e0b46797038922274c503d10bc60fb7daa4916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 02:32:19 +00:00
Jenhou (Alan) Huang
e94f159054
Merge "Fix group cast volume slider not disabled after switching to group devices." into tm-dev
2022-03-25 02:26:54 +00:00
PETER LIANG
d2fcfa1dee
Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev am: d2e82f8e6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252808
Change-Id: Ibd07d6fa1979b1315582a1f8b44d4ab04166956a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 00:54:37 +00:00
PETER LIANG
d2e82f8e6d
Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev
2022-03-25 00:30:55 +00:00
TreeHugger Robot
ce49123205
Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev am: d84516dd28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352024
Change-Id: I569924849f4a3bafc95cce6c1325f9f10bae8a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 00:13:20 +00:00
TreeHugger Robot
d84516dd28
Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev
2022-03-24 23:51:31 +00:00
Quang Luong
8cf82f41d5
Increase WifiEntryPreference summary max lines for verbose logging
...
If Wifi verbose logging is on, increase the max lines for
WifiEntryPreference's summary to 100 in order to fit the extra verbose
logging information.
Bug: 222337006
Test: manually build and verify verbose summary fits
Change-Id: I919ae1bcfb26ea8c2548ebdcd3387c90e1d17ea9
2022-03-24 16:17:23 -07:00
Giulio Fiscella
5dfad2eb8c
[automerge] Use migrated severity levels 2p: 2a775c69fc 2p: b5446ce437
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Bug: 225388845
Change-Id: I1726bd5f8d1c2393e5abaffed8d70bd9cb0ec3e9
2022-03-24 19:10:30 +00:00
Giulio Fiscella
b5446ce437
[automerge] Use migrated severity levels 2p: 2a775c69fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Bug: 225388845
Change-Id: I9aae5c32f87f2b225547e3d36dac94f5d2646ca5
2022-03-24 19:10:17 +00:00
Giulio Fiscella
2a775c69fc
Use migrated severity levels
...
Bug: 225388845
Test: atest SettingsUnitTests
Change-Id: I8e7f06dc8fa7c96c14de738e19dee11ec967bb0c
2022-03-24 18:57:21 +00:00
TreeHugger Robot
4ccde95a1a
Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev
2022-03-24 17:55:23 +00:00
TreeHugger Robot
b9bbd922c0
Merge changes from topic "presubmit-am-e8878964df004ef1a08911a61493aad3"
...
* changes:
[automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298 2p: 352f747f82
[automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298
Enable Encryption & Creds UI for Secondary users
2022-03-24 17:55:23 +00:00
TreeHugger Robot
d4b4836ebd
Merge changes from topic "presubmit-am-e8878964df004ef1a08911a61493aad3" into tm-mainline-prod
...
* changes:
[automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298
Enable Encryption & Creds UI for Secondary users
2022-03-24 17:55:23 +00:00
Roopa Sattiraju
64f9d41ee3
Changing apk name in the manifest and the corresponding packages.
...
BUG: 226403247
Test: TH
Change-Id: I49ad1169899ffbb76ad00f7d5d02f815ace295e7
2022-03-24 10:30:03 -07:00
Abel Tesfaye
01d030ccc6
Merge "Use setRotationLock in LockScreenRotationPreferenceController"
2022-03-24 17:25:58 +00:00
Joshua Mccloskey
9fdbd6501c
Only play fp vibration if accessibility is enabled.
...
Fixes: 222593183
Test: Verified haptic no longer comes unless accessibility is enabled.
Change-Id: Ica04acfe9501bc4ab1afacd77b8ea7cbf725281e
2022-03-24 16:26:30 +00:00
Kedar Chitnis
993371d476
Merge "Revert "Guest mode UX flow updates to user settings""
2022-03-24 13:25:21 +00:00
TreeHugger Robot
e6b4297cc3
Merge "Update enable toggle processing." into tm-dev
2022-03-24 13:20:57 +00:00
TreeHugger Robot
2e2b5e1e1e
Merge changes from topic "presubmit-am-fcba31f692964114b53e9fb9168a57af" into tm-mainline-prod
...
* changes:
[automerge] Update enable toggle processing. 2p: 058796b7eb
Update enable toggle processing.
2022-03-24 13:20:57 +00:00
TreeHugger Robot
815af402fc
Merge changes from topic "presubmit-am-fcba31f692964114b53e9fb9168a57af"
...
* changes:
[automerge] Update enable toggle processing. 2p: 058796b7eb 2p: 9b0a2c7612
[automerge] Update enable toggle processing. 2p: 058796b7eb
Update enable toggle processing.
2022-03-24 13:20:57 +00:00