Commit Graph

50810 Commits

Author SHA1 Message Date
Antony Sargent
d08c7cd00f Strings changes for opportunistic mobile networks
-Summary for opportunistic networks on multi-network header on the
 Network & internet home page. There are two strings we need here for
 when the network is configured but isn't being actively used: "In
 range" (e.g. we would be using it for data, but we already have a wifi
 connection) and "Not in range".

-Summary of the mobile data switch for opportunistic networks: "Phone
 will automatically switch to this carrier when in range".

Bug: 127529917
Bug: 128859152
Test: compile
Change-Id: I25e2f359790db6cfc328831c9bd06c172c9d9ad3
2019-03-25 11:07:11 -07:00
Soonil Nagarkar
c5dd4e503c Fix control flow bug in preference controller
BUG: 118908907
Test: manual
Change-Id: I5300309a13833e278902c75090c9f7de43d6e2b7
2019-03-25 10:52:28 -07:00
Winson Chung
ed8b0aebea Merge "Updating settings to use resource overlay instead of setting." 2019-03-25 16:58:11 +00:00
Salvador Martinez
12256ca49f Merge "Add dark mode strings" 2019-03-25 15:43:59 +00:00
TreeHugger Robot
6029cf9677 Merge "Do no crash when profile is deleted" 2019-03-25 14:27:28 +00:00
cosmohsieh
10d648af3b Fix inconsistent border width in QR code scanning camera
1) Fix border width become larger in the corner.
2) Correct border width

Bug: 127654782
Test: manual
Change-Id: I792ac571b5c59d14af82848698d76cb59a2f4249
2019-03-25 16:37:29 +08:00
Winson Chung
d16e3233af Updating settings to use resource overlay instead of setting.
Bug: 127366543
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest

Change-Id: I021d05a21e00136c6f3651247964319274bdab91
2019-03-25 00:26:39 -07:00
TreeHugger Robot
e29b62cc83 Merge "Import translations. DO NOT MERGE" 2019-03-25 05:53:50 +00:00
Bill Yi
365f23e49d [automerger skipped] Import translations. DO NOT MERGE am: e6d11ed962 -s ours
am: 2fab42da0a -s ours
am skip reason: subject contains skip directive

Change-Id: I9c0510407818d9b5ebc12954d029e53f6f5574b5
2019-03-24 22:42:26 -07:00
Bill Yi
2fab42da0a [automerger skipped] Import translations. DO NOT MERGE
am: e6d11ed962 -s ours
am skip reason: subject contains skip directive

Change-Id: I144c24a4b3c2dcab4693d0f5eb45a2df29b2c380
2019-03-24 22:38:25 -07:00
Bill Yi
e6d11ed962 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
2019-03-24 15:43:53 -07:00
Bill Yi
78d50e9afd Import translations. DO NOT MERGE
Change-Id: Ic074f6ea5240dba0cc33def268871adc3a3a9f69
Auto-generated-cl: translation import
2019-03-24 14:26:02 -07:00
Bill Yi
aa0d851e11 Import translations. DO NOT MERGE
Change-Id: I2ac8a855320e331141528a7007f220b587b06535
Auto-generated-cl: translation import
2019-03-23 23:37:59 -07:00
Bill Yi
8c4cac59b3 Import translations. DO NOT MERGE
Change-Id: I2f73ce8833edd4dacc89d18a45c600deea9f2e29
Auto-generated-cl: translation import
2019-03-23 10:58:45 -07:00
Andrew Sapperstein
63ab34827f Merge "Update eSIM deletion strings." 2019-03-23 02:51:06 +00:00
TreeHugger Robot
9ed12130b1 Merge "Add String for new graph from Privacy screen" 2019-03-23 02:17:28 +00:00
Hall Liu
928d2abc57 Merge "Show the disclaimer regarding WFC location privacy policy" 2019-03-23 02:13:33 +00:00
TreeHugger Robot
24983db38a Merge "String changes for some SIM switch confirmation dialogs" 2019-03-23 01:53:22 +00:00
Malcolm Chen
f2fca31c51 Clean up a few names of Telephony intent extra.
Bug: 128645056
Test: build
Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
2019-03-22 18:03:42 -07:00
TreeHugger Robot
60320024cf Merge "Adding strings for heap dump dev options." 2019-03-23 00:39:57 +00:00
TreeHugger Robot
a6f2d8133b Merge "Add new sticky battery saver strings" 2019-03-22 23:49:32 +00:00
Antony Sargent
fcc9440a52 String changes for some SIM switch confirmation dialogs
These are changes for strings used in two scenarios:

-When switching which SIM is used for mobile data. This is an update to
 some existing strings.

-Enabling an eSIM when another one is already enabled (so the first one
 will need to be disabled). These are new strings.

Bug: 129156640
Test: compile, plus manual (run a device in DSDS mode, go to details for
SIM that isn't currently used for mobile data, and tap on mobile data
switch)

Change-Id: Ie9dfe23c466cb454bbad916ba83b833967a0da0e
2019-03-22 16:47:33 -07:00
Salvador Martinez
f3daccde12 Add dark mode strings
This adds some dark mode strings and also tweaks the title string
for the preference.

Test: phone boots
Bug: 124252163
Change-Id: I32b8eda6d28ba03dd895a36db536ce5334713f9a
2019-03-22 15:38:43 -07:00
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