Lei Yu
fb93cb224f
Merge "Add fp icon with background shape"
2019-03-22 22:03:53 +00:00
Kweku Adams
8d35e03390
Adding strings for heap dump dev options.
...
This is taken from http://ag/6794787 .
Bug: 77490269
Test: N/A
Change-Id: I37e6abe2e58c0d68bd8dc66a4a715608e7e18484
2019-03-22 14:57:25 -07:00
Ryan Mitchell
139ea3f082
Merge "Fix Settings test that uses OverlayInfo"
2019-03-22 21:39:41 +00:00
TreeHugger Robot
72f63e2ccc
Merge "Strings for erase SIM preference"
2019-03-22 21:33:19 +00:00
Salvador Martinez
e7908b5a4d
Add new sticky battery saver strings
...
Adds some strings we'll need to update the preference for sticky
battery saver.
Test: phone boots
Bug: 126938839
Change-Id: I6e7f78f832490e2fe003418bac4d2caec60ddbac
2019-03-22 14:07:29 -07:00
Salvador Martinez
6cf1399d5e
Merge "Rename battery saver schedule mode apis"
2019-03-22 20:52:13 +00:00
TreeHugger Robot
f28a845bcc
Merge "Switch some strings to 'Downloaded SIM' instead of 'eSIM'"
2019-03-22 20:37:21 +00:00
Andrew Sapperstein
88930e373e
Update eSIM deletion strings.
...
Adds some conditional behavior for the confirmation screens.
When the erase eSIM option is visible and checked, shows alternate string.
Fixes: 126262481
Fixes: 118751918
Test: visual inspection & make -j RunSettingsRoboTests
Change-Id: I40f983b03ad470d785bf104e645dbc92e7897d2d
2019-03-22 13:03:25 -07:00
jackqdyulei
36ce63dcb5
Add fp icon with background shape
...
Fixes: 126425211
Test: RunSettingsRoboTests
Change-Id: I779f76f597b80d73b6dd6eb9e43a96abc9fee0bb
2019-03-22 12:06:36 -07:00
tmfang
616f2f94c9
Add String for new graph from Privacy screen
...
Test: rebuild
Bug: 129132950
Change-Id: I25b9edf80d0ed11e504724d475d902eac485f85d
2019-03-23 03:01:36 +08:00
TreeHugger Robot
4d33ead8ef
Merge "Updated privacy settings to launch custom content capture settings when available."
2019-03-22 18:35:58 +00:00
Antony Sargent
72286f2908
Switch some strings to 'Downloaded SIM' instead of 'eSIM'
...
We also added a '/' divider to distinguish the two bits of state that
these strings convey - active vs inactive, and SIM vs eSIM (aka
downloaded sim).
Fixes: 127821561
Test: m Settings
Change-Id: Ibaa611bb5585dd9797e4db2fb4d684274be26791
2019-03-22 11:27:10 -07:00
Antony Sargent
e4d93dfa34
Strings for erase SIM preference
...
These are strings for a preference and its associated dialogs allowing a
user to erase an eSIM profile.
Bug: 124254555
Test: m Settings
Change-Id: Ieb57121544687ff96ad2c939144497aaf7d29367
2019-03-22 11:09:47 -07:00
TreeHugger Robot
c14515cc45
Merge "Add unofficial intent for BatterySaverSchedule screen"
2019-03-22 17:21:15 +00:00
Salvador Martinez
7fb560af4f
Rename battery saver schedule mode apis
...
The APIs that back these settings got renamed so this CL just
refactors all the calls to use the new names.
Test: robotests still pass
Bug: 126944845
Change-Id: I2975c7c79998823058db2c0ced2e5cf02216a106
2019-03-22 10:02:51 -07:00
Alex Kershaw
73136b6e03
Merge "Add new policy transparency UI strings."
2019-03-22 16:44:19 +00:00
Irina Dumitrescu
60d5117b9f
Merge "Fail the screen lock flow if the old password has already changed."
2019-03-22 16:12:39 +00:00
Ryan Mitchell
5f6924761e
Fix Settings test that uses OverlayInfo
...
Now that targetOverlayableName has been added to OverlayInfo, the tests
that construct the info objects must be fixed.
Bug: 128830059
Test: atest SettingsRoboTestStub
Change-Id: I2cee25e417ec643f758ebe40551cc97b1f0828ac
2019-03-22 08:15:44 -07:00
Felipe Leme
fcf98251f2
Updated privacy settings to launch custom content capture settings when available.
...
Test: manual verification
Test: atest EnableContentCapturePreferenceControllerTest \
CtsContentTestCases:android.content.cts.AvailableIntentsTest#testRequestEnableContentCaptureIntent
Test: adb shell am start-activity -a android.settings.REQUEST_ENABLE_CONTENT_CAPTURE
Fixes: 119264902
Change-Id: I2a030c31d966d40feb6ba449e4bbc9ef8cf0565b
2019-03-22 08:10:48 -07:00
Rubin Xu
654a78b56e
Do no crash when profile is deleted
...
Catch the exception and finish the activity.
Change-Id: I45deec32fd49119ab7943a941158bca82b63c432
Fix: 122823738
Test: manual
2019-03-22 15:06:56 +00:00
TreeHugger Robot
8bb2c1da2d
Merge "More strings for bubble settings"
2019-03-22 13:57:29 +00:00
Alex Kershaw
874dc13274
Add new policy transparency UI strings.
...
This will ultimately be used in CL
Iffbe4d466e4dc8ba5255b8a37d828da09b52a3b3.
Bug: 123930863
Test: Not applicable
Change-Id: I7ed8ebc97e34dd7f1ea5f82244686ab3723646b9
2019-03-22 13:12:20 +00:00
TreeHugger Robot
403da03aa5
Merge "Add strings for "swipe to dismiss" bottom bar style."
2019-03-22 12:51:10 +00:00
Irina Dumitrescu
4b96dc3ec7
Fail the screen lock flow if the old password has already changed.
...
Test: atest RunSettingsRoboTests
Bug: 120039091
Change-Id: Ib0860ccbc1ba84a2ac8dafcf3cf33f6ddf160e4c
2019-03-22 11:49:00 +00:00
TreeHugger Robot
4db6ebbf4d
Merge "Handle navigation back problem from About Phone"
2019-03-22 11:29:42 +00:00
Lucas Lin
b86bae86e1
[automerger skipped] Merge "Modify dialog message for partial connectivity" am: f467ee4a28
am: 8701e18275
...
am: 0fa267fd0b
-s ours
am skip reason: change_id I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1 with SHA1 7335c594be
is in history
Change-Id: I7a1e1ca059c0f61cbe29ea0576542c46bf1b0317
2019-03-22 03:28:52 -07:00
Arc Wang
25595994b7
Add divider line in Preference for scan QR code button and share hotspot button
...
Use com.android.settingslib.R.layout.preference_two_target in
WifiTetherSsidPreference to add divider line.
Bug: 128940862
Test: manual test
Change-Id: I46dabcee31a91b68b8c2e57c9840a59f8a1be304
2019-03-22 18:06:11 +08:00
Yi-Ling Chuang
d2d3cffda1
Add strings for "swipe to dismiss" bottom bar style.
...
Bug: 126214056
Test: rebuild
Change-Id: I823d1c0ed82d81f415f303810197246ede15690d
2019-03-22 16:25:13 +08:00
TreeHugger Robot
c74577eacf
Merge "Revert "Add divider line in Preference for scan QR code button and share hotspot button""
2019-03-22 08:18:16 +00:00
Sunny Shao
8614058fbd
Handle navigation back problem from About Phone
...
Removed the android:parentActivityName attribute in .Settings$MyDeviceInfoActivity.
Fixes: 128941539
Test: manual test & view
Change-Id: Id5929bd8bcd8b136610fff76e406f62b2ffef8c2
2019-03-22 15:22:36 +08:00
TreeHugger Robot
ec19f48e51
Merge "Change suggestion dismiss day"
2019-03-22 06:48:36 +00:00
Xiangyu/Malcolm Chen
c7b392959e
Merge "Move SIM select logic from SimSelectNotification to Telephony."
2019-03-22 06:48:23 +00:00
Arc Wang
8040f4c59f
Revert "Add divider line in Preference for scan QR code button and share hotspot button"
...
This reverts commit 890f3a4340
.
Reason for revert: I find a UI defect in this fix.
Change-Id: Icdbb1d2b5319636b8c4c54bcdc0fc3562585a15a
2019-03-22 05:36:59 +00:00
TreeHugger Robot
5ccefd53d1
Merge "Check if enrolled Wi-Fi network is reachable in WifiManager#connect onSuccess callback"
2019-03-22 05:36:45 +00:00
TreeHugger Robot
5826f427e2
Merge "Remove shadow from "Apps and Notifications""
2019-03-22 05:19:36 +00:00
Raff Tsai
7c8346331c
Change suggestion dismiss day
...
Fixes: 129021755
Test: manual
Change-Id: Ib3c64be6a5fdc9f77aece710a496b0514de2fb85
2019-03-22 12:00:00 +08:00
TreeHugger Robot
3a00f3bf81
Merge "Add keywords for wifi slice"
2019-03-22 03:42:17 +00:00
TreeHugger Robot
9caf09e1bf
Merge "Clean up manage_applications_apps.xml"
2019-03-22 03:09:14 +00:00
tmfang
aed8f361fc
Remove shadow from "Apps and Notifications"
...
- Also create a util method to reuse it in different class.
Test: visual
Fixes: 128437380
Change-Id: I0e136feed3aead8c37e381095daebded55ef298d
2019-03-22 11:08:15 +08:00
Arc Wang
7599de43f7
Check if enrolled Wi-Fi network is reachable in WifiManager#connect onSuccess callback
...
WifiManager#connect may callback onSuccess even if the Wi-Fi network is not reachable,
it confuses users.
In onSuccess callback, if the Wi-Fi network is unreachable, shows error message.
Bug: 127980127
Test: manual test
Change-Id: I503d6c77c1f1fcab3a1240d904f1c60aaef63aa1
2019-03-22 10:48:27 +08:00
Arc Wang
3196013b1a
Merge "Add strings for adding a different Wi-Fi Easy Connect entry point"
2019-03-22 02:26:33 +00:00
Arc Wang
d2405c7328
Merge "Improve Wi-Fi Easy Connect lock screen UI information"
2019-03-22 02:19:48 +00:00
Cosmo Hsieh
aaf6e03499
Merge "[Network Connection] Don't dismiss dialog when touching outside of dialog"
2019-03-22 01:45:53 +00:00
Lucas Lin
0fa267fd0b
Merge "Modify dialog message for partial connectivity" am: f467ee4a28
...
am: 8701e18275
Change-Id: Icd481ce4dc83b0d60ffeef75bbcfe9277339e4f6
2019-03-21 18:43:39 -07:00
TreeHugger Robot
8f4368ddd7
Merge "Update strings for battery settings"
2019-03-22 01:39:53 +00:00
Lucas Lin
8701e18275
Merge "Modify dialog message for partial connectivity"
...
am: f467ee4a28
Change-Id: I9a022578e14327bfe98a3efa74a99d9f623a031e
2019-03-21 18:31:47 -07:00
TreeHugger Robot
d0e149fde3
Merge "Move WakeScreenGesturePrefController"
2019-03-22 01:19:00 +00:00
Lucas Lin
f467ee4a28
Merge "Modify dialog message for partial connectivity"
2019-03-22 01:16:42 +00:00
TreeHugger Robot
e4a0d1191c
Merge "[Network Connection] Start dialog as affinity activity"
2019-03-22 01:10:39 +00:00
TreeHugger Robot
8eee9a942d
Merge "Do not relaunch ConfirmLock after rotation"
2019-03-22 01:03:50 +00:00