Weng Su
2f87645c47
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
am: c422d95147
am: 9ed56d081c
am: 057c17fec8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: I364fb8f0a45839ce8a7b14dee7de0c2b120eca95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:48:05 +00:00
Weng Su
9ed56d081c
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
am: c422d95147
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: I71a0799dd5561b069d587491f78957e48fa87541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:06:51 +00:00
Weng Su
c422d95147
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: I7ba4a451a493b9d4df278f7aee6bfbacc9bf2322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:47:33 +00:00
Treehugger Robot
8339d051b0
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
am: 973031b290
am: babd81d61c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: Ia9d800a7681ddb35741839eb224d290ab1a2bdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:16:17 +00:00
Weng Su
c68e241fa6
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation"
2022-04-01 08:08:51 +00:00
Treehugger Robot
973031b290
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: I3e34f4f6ef32064e7de1ca0a9aee94c02f94e7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:49:23 +00:00
Treehugger Robot
3fb5213538
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: Ida0dd5521a0bf94599315658b70c14a058295585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:36:46 +00:00
Treehugger Robot
0159ca5d9c
Merge "Settings: Fix cellular internet option Not seen after internet reset"
2022-04-01 06:52:44 +00:00
Treehugger Robot
9731f01852
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
am: 4440e7a067
am: 652f81e035
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I9fb8807007f56d66eaa8ab8348de2d371f6095fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 03:07:32 +00:00
TreeHugger Robot
d286b52223
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
am: 587dba5e1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: I7be92ca85e7fc28ff7923da65c4b1b15301f8e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:24:03 +00:00
Treehugger Robot
4440e7a067
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I56e489c2867242dfc425aba6dea8896d903ab4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:16:00 +00:00
Treehugger Robot
caa0bbd931
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: Iffb14760e676a66d061f500a1e9fc383c2a317e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:01:14 +00:00
TreeHugger Robot
ad5acbdc23
Merge "WiFi restricted connection when scan QR code" into tm-dev
2022-04-01 01:28:56 +00:00
Treehugger Robot
f558fc27d9
Merge "Settings: Fix WifiSettings FC when rotating screen"
2022-04-01 01:23:47 +00:00
Weng Su
2088b4985d
WiFi restricted connection when scan QR code
...
- Use WifiEntry#canConnect() to determine if the network can be
connected.
- Add WiFi network but don't connect if WiFi restricted connection.
- See the result screenshot in b/203168943#comment16
Bug: 203168938
Bug: 203168943
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest
Change-Id: I06d1e832176e540ddd1adce8da46ef8659534ab7
2022-04-01 06:04:34 +08:00
Jason Hsu
9519e55315
Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev am: a0eeda0d65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321712
Change-Id: I8c5c462cd1c78da69d2931d3cf82719e285d3118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:45:51 +00:00
Jason Hsu
a0eeda0d65
Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev
2022-03-31 17:26:41 +00:00
jasonwshsu
f02c069f3d
Extract inner helper from AccessibilitySettings to public
...
* Need to be used in 'Connected device' page for hearing aid device
Bug: 225117933
Bug: 227172850
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RestrictedPreferenceHelperTest
Change-Id: Icda456aa9c7597dc113775d1359acb0a8430768c
2022-03-31 21:49:13 +08:00
Tom Hsu
7eb32dec44
Merge "[Panlingual] Revamp the panlingual UI in Settings." into tm-dev
2022-03-31 08:32:52 +00:00
hoffc
0991b39ed3
Settings: Fix NPE FC when access saved wifi p2p device after screen rotation
...
Rotating screen, wifi p2p setting fragement will be re-created and the selected wifi p2p device will be saved in onSaveInstanceState. However, now this saved wifi p2p device is restored in onActivityCreated, this is too late. So when getting this saved wifi p2p device return NULL in onCreateDialog and leads to NPE force close.
Restore the saved wifi p2p device in onCreateView instead of onActivityCreated.
Bug: 220025725
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I9b746e21f7f3651c69b1445f2389c089ec19319c
2022-03-31 06:52:37 +00:00
hoffc
5710b02972
Settings: Fix cellular internet option Not seen after internet reset
...
Cellular internet preference will be hidden during reset internet, and resume to be visible after successfully reset or reset timeout. Due to the wrong immediately param value assigned for hidePreference method, which results in cellular internet preference not seen after internet reset.
Assign correct immediately param value when resuming after internet reset.
Bug: 224893326
Test: manual test
atest InternetResetHelperTest
Change-Id: I3f8d5dd9de2a56ecfe201483ee8a95b379e8fe65
2022-03-31 04:01:58 +00:00
hoffc
f3fe5cf197
Settings: Fix WifiSettings FC when rotating screen
...
Rotating screen will trigger wifisettings re-creation. Force close occurs If receiving wifi picker tracker callback during activity finishing.
Bug: 218411211
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Change-Id: I06d251a8a12d3f8785db24ead0abe31c0f34cc9b
2022-03-31 04:00:52 +00:00
tom hsu
9be043e750
[Panlingual] Revamp the panlingual UI in Settings.
...
- Create a Activity to contain AppLocaleDetail and
LocalePickerWithRegion
- Update the Entry from apps language page
Bug: 223089715
Test: local test pass
Change-Id: Id01e93f3df32412c7323ca577a149009eb1862ad
Merged-In: Id01e93f3df32412c7323ca577a149009eb1862ad
2022-03-31 03:35:21 +00:00
Aaron Liu
3d3957830e
Merge "Home Controls: Add conditional copy for setting." into tm-dev am: 126e629c7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17476399
Change-Id: I07568b33ba507c78fe9ad3fe2f058687533893d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 15:20:25 +00:00
Aaron Liu
126e629c7d
Merge "Home Controls: Add conditional copy for setting." into tm-dev
2022-03-30 15:05:05 +00:00
Jason Chiu
e60dd45156
Merge "Refine layouts for large screen" into tm-dev am: 51316c13a1
am: 187b39edc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489
Change-Id: I525dbf313c7865746f33425a85052dc73a51f41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:22:22 +00:00
Jason Chiu
51316c13a1
Merge "Refine layouts for large screen" into tm-dev
2022-03-30 08:10:42 +00:00
Weng Su
4026f4134f
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I17625880bf59eb632cc0dcdbc222c60a516d119e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:40:51 +00:00
Weng Su
7abffe0057
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: If2619c93286363f268bb7021af1037195fcba4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:26:59 +00:00
Jason Hsu
33a5139d0e
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806
Change-Id: I5cfa8a58fb3a3f204b3978b473fe993091e9826a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:17:46 +00:00
Weng Su
a30d123e12
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I4d1bf49f4eab2ce72148cd308b5c217d814ab75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:11:32 +00:00
Jason Hsu
abd4fd54b1
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev
2022-03-30 06:03:00 +00:00
Jason Chiu
680fce3acd
Refine layouts for large screen
...
- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
of being highlighted
- Add an interface to support dynamic split layout for suggestion cards
Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
2022-03-30 04:54:30 +00:00
Aaron Liu
c138118d48
Home Controls: Add conditional copy for setting.
...
Add conditional copy for when allow trivial devices setting is disabled.
Add guidance on how to enable it.
Bug: 227344249
Test: Manual and unit test
Change-Id: I0f2f6dc933804ee6ba15dc180dc717d2a5b729a5
2022-03-29 17:27:17 +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
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
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
jasonwshsu
906805a591
Set title to the hearing aid pair instruction dialog
...
Bug: 225117843
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidDialogFragmentTest
Change-Id: Ia1f3dadba84e3302a87aba1274e77f31a74eea1b
2022-03-28 15:31:43 +08:00
Weng Su
4c4a1f58c1
Restrict secondary users to share Wi-Fi network
...
- Remove "Share" and "Forget" options from the long press menu
- Add SafetyNet Logging for security report
Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
Merged-In: Ic434f0583cba557228c72508a501347ffa3141e1
2022-03-28 03:15:18 +08:00
SongFerngWang
696f538ff3
[MEP] renew the default data selection UI am: db2ddb6a92
am: e9d39b468d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026
Change-Id: I0b55a215eaa751232ffe69c7cfc16cf713e3d390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:35 +00:00
SongFerngWang
db2ddb6a92
[MEP] renew the default data selection UI
...
- renew the default Data/Call/SMS selection
Bug: 199902896
Test: build pass and local UI test
Change-Id: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
Merged-In: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
2022-03-25 17:04:15 +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
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