Bill Yi
143ab6f64c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-25 00:19:14 +00:00
Bill Yi
9a51bd76bf
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-25 00:19:02 +00:00
Bill Yi
cbd3f7ab89
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d70a7f7442
-s ours am: 195b137800
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13397290
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa5e20ba241bbbb63586be14fa92013c9ec8abac
2021-01-24 17:57:01 +00:00
Bill Yi
195b137800
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d70a7f7442
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13397290
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c33d55aab01e1a4bfc168b995dd4f6bd0e452b3
2021-01-24 17:17:21 +00:00
Bill Yi
4fc870219b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id3a0b6565a0a8cf38f65bd9b8f537f4aa1da5d29
2021-01-24 13:39:50 +00:00
Bill Yi
1d403bc951
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I745025a78797cd245725fc33964738d8122f7841
2021-01-24 02:16:48 -08:00
Bill Yi
d70a7f7442
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31f2d5d2686777c42e311f92bc352efd150eb164
2021-01-24 00:41:08 -08:00
SongFerng Wang
11501a0bc2
Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason"
2021-01-23 07:41:11 +00:00
Felipe Leme
3158f45161
Merge "Refactored Settings calls to removeUserOrSetEphemeral()."
2021-01-22 16:31:09 +00:00
Stanley Wang
8e2ecd5918
Merge "Fix the ClassCastException of ChannelNotificationSettings"
2021-01-22 06:58:54 +00:00
Weng Su
bfefb8015a
Merge "[Provider Model] Update internet preference icon and summary"
2021-01-22 05:34:14 +00:00
Tsung-Mao Fang
4c34eb8537
Merge "Fix truncated issue on search text"
2021-01-22 05:04:03 +00:00
Stanley Wang
b451e8f115
Fix the ClassCastException of ChannelNotificationSettings
...
Update the LayoutPreference to SettingsMainSwitchPreference.
Fix: 177907827
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: I7ce320b8e38432faf685914bf91cf1daa62b2687
2021-01-22 03:24:33 +00:00
Sarah Chin
5a8b96a2af
Merge "Update onSubscriptonOverride listener"
2021-01-21 18:28:19 +00:00
Tsung-Mao Fang
3692c70cc1
Fix truncated issue on search text
...
Test: See the screen
Fix: 177665666
Change-Id: I4941ff95320141c7ea7c9f1947138c6940bdf501
2021-01-21 10:23:44 +00:00
Weng Su
46837dc4d5
[Provider Model] Update internet preference icon and summary
...
- Airplane mode icon/summary
- Airplane mode networks icon/summary
- Wi-Fi network connected icon/SSID
- Cellular network connected icon/carrier-name
- Ethernet network connected icon/summary
- Screenshot:
https://screenshot.googleplex.com/AzhCEX2HjwYUMtJ
https://screenshot.googleplex.com/9BRfQLMW4UvHqqq
https://screenshot.googleplex.com/5jdi8oEjMPUURdT
Bug: 176796623
Test: manual test
- atest -c InternetUpdaterTest \
InternetPreferenceControllerTest
Change-Id: Icc8944dabdac597f12b67cffa72cb0be02d9671d
2021-01-21 17:24:10 +08:00
Arc Wang
02c9b032cd
Show "Safety & emergency" in Settings search result
...
Add android:key to PreferenceScreen of EmergencyDashboardFragment.
Bug: 177426215
Test: manual
Change-Id: I9ad059a1dd051cb1ca0c038fd6c47b739852c54d
2021-01-21 07:24:47 +00:00
TreeHugger Robot
9c4e419b61
Merge "Default emergency gesture setting On."
2021-01-21 02:49:25 +00:00
TreeHugger Robot
f6390d7924
Merge "Revert "Workaround Wi-Fi Settings NullPointerException""
2021-01-21 02:44:15 +00:00
Manish Singh
8793a746fa
Merge "Switch the default option from B to A"
2021-01-20 23:46:25 +00:00
Bill Yi
a2be7b8311
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2bf6a2bbd2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13375919
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If29c9dc5f7bc59dbabd7b642575c6504788a6548
2021-01-20 22:12:17 +00:00
Bill Yi
3743d2acb6
Merge changes from topic "presubmit-am-311b41832b7f4d57b11bec6ed18f8095"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f253392e46
Import translations. DO NOT MERGE ANYWHERE
2021-01-20 21:52:36 +00:00
Bill Yi
2bf6a2bbd2
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-01-20 21:52:36 +00:00
Bill Yi
6131c314f0
Merge changes from topic "presubmit-am-c0aae4a9c9494a35a4be665a1ad0f83d"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b375f1e2f0
Import translations. DO NOT MERGE ANYWHERE
2021-01-20 21:52:20 +00:00
Fan Zhang
e81091175e
Default emergency gesture setting On.
...
And a few drive-by fixes:
* Move all emergency gesture fragments and controllers to emergency
package for better code colocation.
* Remove the placeholder video preference from emergency_gesture_settings.xml
Bug: 178009196
Test: reran robotests
Change-Id: Ifcb591e7ab8e5e5494c480cbbe9410c08c296f8e
2021-01-20 13:08:04 -08:00
Peter Wang
bdcf4b7535
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA"
2021-01-20 20:55:00 +00:00
Manish Singh
1c1329948f
Switch the default option from B to A
...
The switch implies that we will not transcode by default.
Test: manual
BUG=177931834
Change-Id: I6daee5bdf0f77ef65eda2db6be055fad0bceded3
2021-01-20 19:37:28 +00:00
TreeHugger Robot
a347993239
Merge "Add metrics for EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY"
2021-01-20 18:05:49 +00:00
Yanting Yang
47e0556e98
Revert "Workaround Wi-Fi Settings NullPointerException"
...
This reverts commit 99eb12048c
.
Reason for revert: Revert this workaround since the real solution has been submitted and released. More information please see b/177766209.
Change-Id: I566194ff71bb9e912407d6d4b3798adc6be71779
2021-01-20 16:41:36 +00:00
Bill Yi
87bc28225c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b375f1e2f0
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13375400
Change-Id: I5d669d3b7ee62ea439703592e1f01aff2d4f8efc
2021-01-20 15:55:14 +00:00
TreeHugger Robot
0f4b83a760
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-20 15:55:00 +00:00
Bill Yi
b375f1e2f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24202252f42fa2fd1c401b437ede5f90a561ac6a
2021-01-20 07:54:48 -08:00
Alex Johnston
8403e31d82
Merge "Fix CredentialManagementAppControllerTest"
2021-01-20 15:24:14 +00:00
Bill Yi
ac982a0cdd
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f253392e46
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13375919
Change-Id: I9533336ffb06722361bdafe42b57af21df523103
2021-01-20 15:06:57 +00:00
Bill Yi
f253392e46
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iebb51a5fceee6d39e00b2de88c7d19a352411647
2021-01-20 07:06:43 -08:00
TreeHugger Robot
f4e71b0019
Merge "Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY"
2021-01-20 14:40:25 +00:00
Bill Yi
be90f6318f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I19076a8152f6ba636d959f92303fcdd9d5df46e5
2021-01-20 12:01:54 +00:00
Alex Johnston
8fc55e0231
Fix CredentialManagementAppControllerTest
...
Bug: 175277372
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CredentialManagementAppControllerTest
Change-Id: I5f9177d19232f38a761df9adba94d080464120e2
2021-01-20 11:29:07 +00:00
Rubin Xu
bc5da644dd
Add metrics for EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY
...
Bug: 169832516
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: I2bcd6c4f1a5f04582bb88ec9fb285621b9ec77eb
2021-01-20 11:17:13 +00:00
Rubin Xu
ff1b547548
Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY
...
When set, only enforce password requirement explicitly set device-wide.
As part of the change, restructure the code such that ChooseLockGeneric
becomes the central place for aggregating password requirements from
different parties, while ChooseLockPassword only enforces whatever
password reuirement it is told (by ChooseLockGeneric via intent extras)
Bug: 169832516
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: I0acbea4819c13d4a8444c7b06928baccead18837
2021-01-20 11:16:22 +00:00
Ben Chung
1c7eba6660
Merge "Add audio adjustment fragment in a11y settings"
2021-01-20 08:49:35 +00:00
SongFerngWang
60c4163244
Replace allowedNetworkTypes with allowedNetworkTypesForReason
...
- Replace getAllowedNetworkTypes with
getallowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_CARRIER)
- Replace "Settings.Global.PREFERRED_NETWORK_MODE" with
"getAllowedNetworkTypesForReason(USER)"
- Move EnabledNetworkModePreferenceControllerTest from robotests to unit
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT
- Rename PreferredNetworkModeContentObserver to AllowedNetworkTypesListener
Bug: 161434786
Test: build pass.
(PASS)atest CdmaSystemSelectPreferenceControllerTest
(PASS)atest PreferredNetworkModePreferenceControllerTest
(PASS)atest AllowedNetworkTypesListenerTest
(PASS)atest EnabledNetworkModePreferenceControllerTest
(PASS)atest MobileNetworkUtilsTest
Change-Id: I2b981569ad11cf70a558c1952cc2e077464328d8
2021-01-20 08:23:08 +00:00
Jeremy Goldman
1f09c95571
Merge "Helper function to return the unique name for subscription info"
2021-01-20 00:14:41 +00:00
Peter Wang
0044fee7cb
Add an intent filter for MobileNetworkListActivity to enable access
...
from the LPA
Bug: 170507492
Test: Local
Change-Id: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
2021-01-19 15:18:14 -08:00
TreeHugger Robot
844bfb3683
Merge "Fix null handling"
2021-01-19 21:14:40 +00:00
Abel Tesfaye
fc2582c0ea
Merge "Correct Wifi Share UI margins and capitalization"
2021-01-19 20:00:49 +00:00
Julia Reynolds
833514376e
Fix null handling
...
Test: cts verifier, notification listener
Fixes: 177202279
Change-Id: Ib25915b0b5a60e9c39986d3ba3af3073e9d2b822
2021-01-19 14:48:52 -05:00
TreeHugger Robot
544310993e
Merge "Update FingerprintEnrollFindSensor for UDFPS"
2021-01-19 17:51:32 +00:00
Mill Chen
057ce4055e
Update FingerprintEnrollFindSensor for UDFPS
...
Since the education page of UDFPS is different from the one for rear
fingerprint, it's necessary to create a new education page for UDFPS and
update the decription.
Bug: 177026524
Test: visual verified
Change-Id: I70eb80484cccfbb583c32dbaadbc6c2744b5db60
2021-01-20 00:01:35 +08:00
Jeremy Goldman
67c75ac102
Helper function to return the unique name for subscription info
...
Many classes within Settings have access to the subscription info, rather
than only having access to the subscription id. For these classes, it is
more convenient to have a helper method where the whole subscription
info can be passed in, rather than having to call the
getSubscriptionId() helper method in so many locations within the
telephony settings codebase.
Bug: 150370656
Bug: 148303118
Test: atest -c SubscriptionUtilTest
Change-Id: I181960933ab8610d5572b7a7d6671fab8c1dbd22
2021-01-19 09:30:14 +00:00