OSDN Git Service
Bill Yi [Sat, 23 Mar 2019 17:58:45 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f73ce8833edd4dacc89d18a45c600deea9f2e29
Auto-generated-cl: translation import
Andrew Sapperstein [Sat, 23 Mar 2019 02:51:06 +0000 (02:51 +0000)]
Merge "Update eSIM deletion strings."
TreeHugger Robot [Sat, 23 Mar 2019 02:17:28 +0000 (02:17 +0000)]
Merge "Add String for new graph from Privacy screen"
Hall Liu [Sat, 23 Mar 2019 02:13:33 +0000 (02:13 +0000)]
Merge "Show the disclaimer regarding WFC location privacy policy"
TreeHugger Robot [Sat, 23 Mar 2019 01:53:22 +0000 (01:53 +0000)]
Merge "String changes for some SIM switch confirmation dialogs"
TreeHugger Robot [Sat, 23 Mar 2019 00:39:57 +0000 (00:39 +0000)]
Merge "Adding strings for heap dump dev options."
TreeHugger Robot [Fri, 22 Mar 2019 23:49:32 +0000 (23:49 +0000)]
Merge "Add new sticky battery saver strings"
Antony Sargent [Fri, 22 Mar 2019 23:30:30 +0000 (16:30 -0700)]
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
Lei Yu [Fri, 22 Mar 2019 22:03:53 +0000 (22:03 +0000)]
Merge "Add fp icon with background shape"
Kweku Adams [Fri, 22 Mar 2019 18:01:17 +0000 (11:01 -0700)]
Adding strings for heap dump dev options.
This is taken from http://ag/
6794787.
Bug:
77490269
Test: N/A
Change-Id: I37e6abe2e58c0d68bd8dc66a4a715608e7e18484
Ryan Mitchell [Fri, 22 Mar 2019 21:39:41 +0000 (21:39 +0000)]
Merge "Fix Settings test that uses OverlayInfo"
TreeHugger Robot [Fri, 22 Mar 2019 21:33:19 +0000 (21:33 +0000)]
Merge "Strings for erase SIM preference"
Salvador Martinez [Fri, 22 Mar 2019 21:05:30 +0000 (14:05 -0700)]
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
Salvador Martinez [Fri, 22 Mar 2019 20:52:13 +0000 (20:52 +0000)]
Merge "Rename battery saver schedule mode apis"
TreeHugger Robot [Fri, 22 Mar 2019 20:37:21 +0000 (20:37 +0000)]
Merge "Switch some strings to 'Downloaded SIM' instead of 'eSIM'"
Andrew Sapperstein [Thu, 7 Mar 2019 22:18:15 +0000 (14:18 -0800)]
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
jackqdyulei [Tue, 19 Mar 2019 17:18:19 +0000 (10:18 -0700)]
Add fp icon with background shape
Fixes:
126425211
Test: RunSettingsRoboTests
Change-Id: I779f76f597b80d73b6dd6eb9e43a96abc9fee0bb
tmfang [Fri, 22 Mar 2019 15:41:08 +0000 (23:41 +0800)]
Add String for new graph from Privacy screen
Test: rebuild
Bug:
129132950
Change-Id: I25b9edf80d0ed11e504724d475d902eac485f85d
TreeHugger Robot [Fri, 22 Mar 2019 18:35:58 +0000 (18:35 +0000)]
Merge "Updated privacy settings to launch custom content capture settings when available."
Antony Sargent [Fri, 22 Mar 2019 16:41:20 +0000 (09:41 -0700)]
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
Antony Sargent [Fri, 22 Mar 2019 15:49:14 +0000 (08:49 -0700)]
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
TreeHugger Robot [Fri, 22 Mar 2019 17:21:15 +0000 (17:21 +0000)]
Merge "Add unofficial intent for BatterySaverSchedule screen"
Salvador Martinez [Thu, 21 Mar 2019 16:51:28 +0000 (09:51 -0700)]
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
Alex Kershaw [Fri, 22 Mar 2019 16:44:19 +0000 (16:44 +0000)]
Merge "Add new policy transparency UI strings."
Irina Dumitrescu [Fri, 22 Mar 2019 16:12:39 +0000 (16:12 +0000)]
Merge "Fail the screen lock flow if the old password has already changed."
Ryan Mitchell [Fri, 22 Mar 2019 15:10:20 +0000 (08:10 -0700)]
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
Felipe Leme [Wed, 20 Mar 2019 15:54:56 +0000 (08:54 -0700)]
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
TreeHugger Robot [Fri, 22 Mar 2019 13:57:29 +0000 (13:57 +0000)]
Merge "More strings for bubble settings"
Alex Kershaw [Thu, 21 Mar 2019 12:35:11 +0000 (12:35 +0000)]
Add new policy transparency UI strings.
This will ultimately be used in CL
Iffbe4d466e4dc8ba5255b8a37d828da09b52a3b3.
Bug:
123930863
Test: Not applicable
Change-Id: I7ed8ebc97e34dd7f1ea5f82244686ab3723646b9
TreeHugger Robot [Fri, 22 Mar 2019 12:51:10 +0000 (12:51 +0000)]
Merge "Add strings for "swipe to dismiss" bottom bar style."
Irina Dumitrescu [Thu, 28 Feb 2019 15:35:36 +0000 (15:35 +0000)]
Fail the screen lock flow if the old password has already changed.
Test: atest RunSettingsRoboTests
Bug:
120039091
Change-Id: Ib0860ccbc1ba84a2ac8dafcf3cf33f6ddf160e4c
TreeHugger Robot [Fri, 22 Mar 2019 11:29:42 +0000 (11:29 +0000)]
Merge "Handle navigation back problem from About Phone"
Lucas Lin [Fri, 22 Mar 2019 10:28:52 +0000 (03:28 -0700)]
[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
Yi-Ling Chuang [Fri, 22 Mar 2019 08:25:13 +0000 (16:25 +0800)]
Add strings for "swipe to dismiss" bottom bar style.
Bug:
126214056
Test: rebuild
Change-Id: I823d1c0ed82d81f415f303810197246ede15690d
TreeHugger Robot [Fri, 22 Mar 2019 08:18:16 +0000 (08:18 +0000)]
Merge "Revert "Add divider line in Preference for scan QR code button and share hotspot button""
Sunny Shao [Fri, 22 Mar 2019 07:22:36 +0000 (15:22 +0800)]
Handle navigation back problem from About Phone
Removed the android:parentActivityName attribute in .Settings$MyDeviceInfoActivity.
Fixes:
128941539
Test: manual test & view
Change-Id: Id5929bd8bcd8b136610fff76e406f62b2ffef8c2
TreeHugger Robot [Fri, 22 Mar 2019 06:48:36 +0000 (06:48 +0000)]
Merge "Change suggestion dismiss day"
Xiangyu/Malcolm Chen [Fri, 22 Mar 2019 06:48:23 +0000 (06:48 +0000)]
Merge "Move SIM select logic from SimSelectNotification to Telephony."
Arc Wang [Fri, 22 Mar 2019 05:36:59 +0000 (05:36 +0000)]
Revert "Add divider line in Preference for scan QR code button and share hotspot button"
This reverts commit
890f3a4340b2cbbe1e82337005383f7a33ddd948.
Reason for revert: I find a UI defect in this fix.
Change-Id: Icdbb1d2b5319636b8c4c54bcdc0fc3562585a15a
TreeHugger Robot [Fri, 22 Mar 2019 05:36:45 +0000 (05:36 +0000)]
Merge "Check if enrolled Wi-Fi network is reachable in WifiManager#connect onSuccess callback"
TreeHugger Robot [Fri, 22 Mar 2019 05:19:36 +0000 (05:19 +0000)]
Merge "Remove shadow from "Apps and Notifications""
Raff Tsai [Fri, 22 Mar 2019 04:00:00 +0000 (12:00 +0800)]
Change suggestion dismiss day
Fixes:
129021755
Test: manual
Change-Id: Ib3c64be6a5fdc9f77aece710a496b0514de2fb85
TreeHugger Robot [Fri, 22 Mar 2019 03:42:17 +0000 (03:42 +0000)]
Merge "Add keywords for wifi slice"
TreeHugger Robot [Fri, 22 Mar 2019 03:09:14 +0000 (03:09 +0000)]
Merge "Clean up manage_applications_apps.xml"
tmfang [Mon, 18 Mar 2019 08:56:09 +0000 (16:56 +0800)]
Remove shadow from "Apps and Notifications"
- Also create a util method to reuse it in different class.
Test: visual
Fixes:
128437380
Change-Id: I0e136feed3aead8c37e381095daebded55ef298d
Arc Wang [Thu, 21 Mar 2019 11:14:17 +0000 (19:14 +0800)]
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
Arc Wang [Fri, 22 Mar 2019 02:26:33 +0000 (02:26 +0000)]
Merge "Add strings for adding a different Wi-Fi Easy Connect entry point"
Arc Wang [Fri, 22 Mar 2019 02:19:48 +0000 (02:19 +0000)]
Merge "Improve Wi-Fi Easy Connect lock screen UI information"
Cosmo Hsieh [Fri, 22 Mar 2019 01:45:53 +0000 (01:45 +0000)]
Merge "[Network Connection] Don't dismiss dialog when touching outside of dialog"
Lucas Lin [Fri, 22 Mar 2019 01:43:39 +0000 (18:43 -0700)]
Merge "Modify dialog message for partial connectivity" am:
f467ee4a28
am:
8701e18275
Change-Id: Icd481ce4dc83b0d60ffeef75bbcfe9277339e4f6
TreeHugger Robot [Fri, 22 Mar 2019 01:39:53 +0000 (01:39 +0000)]
Merge "Update strings for battery settings"
Lucas Lin [Fri, 22 Mar 2019 01:31:47 +0000 (18:31 -0700)]
Merge "Modify dialog message for partial connectivity"
am:
f467ee4a28
Change-Id: I9a022578e14327bfe98a3efa74a99d9f623a031e
TreeHugger Robot [Fri, 22 Mar 2019 01:19:00 +0000 (01:19 +0000)]
Merge "Move WakeScreenGesturePrefController"
Lucas Lin [Fri, 22 Mar 2019 01:16:42 +0000 (01:16 +0000)]
Merge "Modify dialog message for partial connectivity"
TreeHugger Robot [Fri, 22 Mar 2019 01:10:39 +0000 (01:10 +0000)]
Merge "[Network Connection] Start dialog as affinity activity"
TreeHugger Robot [Fri, 22 Mar 2019 01:03:50 +0000 (01:03 +0000)]
Merge "Do not relaunch ConfirmLock after rotation"
Michael Groover [Fri, 22 Mar 2019 00:34:21 +0000 (00:34 +0000)]
Merge "Add Sensors Off QS developer tile"
Mill Chen [Thu, 21 Mar 2019 23:29:49 +0000 (16:29 -0700)]
Add keywords for wifi slice
Wifi slice didn't have a bunch of keywords for search, so users have to
type full matched text to search for wifi setting. We added keywords for
wifi slice to fix it, in which keywords are defined in strings.xml.
Fixes:
109922806
Test: rebuild
Change-Id: Ibe3b65c186cf6f43ae744c1f478d8985e270374c
TreeHugger Robot [Fri, 22 Mar 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Make conditional work properly when toggle it in QS"
Mady Mellor [Thu, 21 Mar 2019 23:59:37 +0000 (16:59 -0700)]
More strings for bubble settings
Test: it compiles
Change-Id: I92964a1864fbe0bca243db424495afd399ade4cc
Fan Zhang [Thu, 21 Mar 2019 23:41:58 +0000 (23:41 +0000)]
Merge "Remove reference to R.id.summary_container."
TreeHugger Robot [Thu, 21 Mar 2019 23:41:15 +0000 (23:41 +0000)]
Merge "Update string for app storage settings"
TreeHugger Robot [Thu, 21 Mar 2019 23:23:45 +0000 (23:23 +0000)]
Merge "Clean up the hard cache in SettingSliceProvider."
Fan Zhang [Thu, 21 Mar 2019 20:46:30 +0000 (13:46 -0700)]
Clean up the hard cache in SettingSliceProvider.
It doesn't need to be a map.
Bug:
129002750
Test: manual
Change-Id: If784dfe4fb497414a04dc5fa8c8374731539d8ed
Mill Chen [Wed, 20 Mar 2019 01:56:11 +0000 (18:56 -0700)]
Make conditional work properly when toggle it in QS
Some conditionals do not work properly when users toggle its state in
QS, the cause is that these conditionals don't have a way to monitor the
status changed. Make RecyclerView handle onWindowFocusChanged event and
make sure that conditionals can update the status when going back to
Settings from QS.
Bug:
118387886
Bug:
123171638
Bug:
123167705
Test: visual, robotests
Change-Id: Ib3bb9bf43afaa58726502eea1e98bcf602bc3677
jackqdyulei [Thu, 21 Mar 2019 19:54:44 +0000 (12:54 -0700)]
Update strings for battery settings
Bug:
112285389
Test: Build
Change-Id: I0be0a4b4ddd18be12a277526711bf88e7f333c5c
Fan Zhang [Thu, 21 Mar 2019 19:44:46 +0000 (12:44 -0700)]
Update string for app storage settings
Fixes:
128347544
Test: visual
Change-Id: I4dd803a04301b39d7f2de8f61eb7d193f8164d0b
TreeHugger Robot [Thu, 21 Mar 2019 19:27:04 +0000 (19:27 +0000)]
Merge "Show connecting and connected messages on the header subtext of Wi-Fi slice"
Rubin Xu [Thu, 21 Mar 2019 15:56:52 +0000 (15:56 +0000)]
Do not relaunch ConfirmLock after rotation
Bug:
122712696
Test: manual
Change-Id: I44fdbdb54b42c3a680bd83fc21c00e5769b83151
Mady Mellor [Thu, 21 Mar 2019 17:29:27 +0000 (17:29 +0000)]
Merge "Update bubbles strings in settings"
TreeHugger Robot [Thu, 21 Mar 2019 16:57:33 +0000 (16:57 +0000)]
Merge "Change Suggestion dismiss day"
TreeHugger Robot [Thu, 21 Mar 2019 16:56:15 +0000 (16:56 +0000)]
Merge "RuntimePermissionUsageInfo.getName() now returns a String."
Beverly [Thu, 21 Mar 2019 14:13:19 +0000 (10:13 -0400)]
Move WakeScreenGesturePrefController
Test: n/a
Bug:
127955764
Change-Id: Ib4ca072e1ade3d2c0fd015e25d95807d8804d74d
TreeHugger Robot [Thu, 21 Mar 2019 13:25:28 +0000 (13:25 +0000)]
Merge "Remove tint to show rainbow drawable on Bluetooth devices slice"
Julia Reynolds [Thu, 21 Mar 2019 13:09:00 +0000 (13:09 +0000)]
Merge "Add settings for individual NAS components"
TreeHugger Robot [Thu, 21 Mar 2019 12:00:28 +0000 (12:00 +0000)]
Merge "Revert layout transition from slice view"
tmfang [Thu, 21 Mar 2019 11:23:41 +0000 (19:23 +0800)]
Clean up manage_applications_apps.xml
Since LinearLayout have only one view(FrameLayout),
LinearLayout is redundant.
It can improve a bit render time.
Test: Open App info screen
Fixes:
124702325
Change-Id: I368b20c5f9916b876586dab71eac43512664d15b
Jason Chiu [Thu, 21 Mar 2019 10:37:41 +0000 (18:37 +0800)]
Show connecting and connected messages on the header subtext of Wi-Fi slice
Fixes:
128631698
Test: robotest
Change-Id: I1ea2a65d09eca9b3dd06f56c4ae69ef7f68ffd86
Yanting Yang [Thu, 21 Mar 2019 10:08:01 +0000 (18:08 +0800)]
Remove tint to show rainbow drawable on Bluetooth devices slice
Bluetooth icon has changed to rainbow icon. These new icons will be
abnormal if apply tint to them.
Fixes:
129038598
Test: visual
Change-Id: Ic02d226a46c36bb0b80f00b2e30d31a311e14e2f
Annie Meng [Thu, 21 Mar 2019 10:17:09 +0000 (10:17 +0000)]
Merge "Use new dataManagementLabel AIDL in Backup Settings"
Yanting Yang [Thu, 21 Mar 2019 08:58:29 +0000 (16:58 +0800)]
Revert layout transition from slice view
Fixes:
129002765
Test: visual
Change-Id: Ice56eb0ee5cd6018927271ab33ad9dd3321953b1
Michele Berionne [Thu, 21 Mar 2019 08:01:43 +0000 (08:01 +0000)]
Merge "Modified MultiSim APIs"
Raff Tsai [Thu, 21 Mar 2019 07:46:48 +0000 (15:46 +0800)]
Change Suggestion dismiss day
Fixes:
129021859
Test: manual
Change-Id: I2da7a0c23f9e266b18482f9593e987287ca9e1f0
TreeHugger Robot [Thu, 21 Mar 2019 06:32:27 +0000 (06:32 +0000)]
Merge "Revert "Import statsdprotolite library to use atoms.proto""
Arc Wang [Thu, 21 Mar 2019 06:31:25 +0000 (14:31 +0800)]
Add strings for adding a different Wi-Fi Easy Connect entry point
Bug:
129031195
Test: NA
Change-Id: I392148328552c268ff6a57836efa9987f4680b39
TreeHugger Robot [Thu, 21 Mar 2019 06:26:27 +0000 (06:26 +0000)]
Merge "Add divider line in Preference for scan QR code button and share hotspot button"
Arc Wang [Wed, 20 Mar 2019 08:34:00 +0000 (16:34 +0800)]
Improve Wi-Fi Easy Connect lock screen UI information
1. Change lock screen title and remove description
2. In QR code generator screen, change summary and show password under QR code picture
Bug:
128920152
Bug:
128576809
Test: manual test
Change-Id: Id096d7f417308df14ffe50c618644750aa991df8
cosmohsieh [Thu, 21 Mar 2019 05:32:19 +0000 (13:32 +0800)]
[Network Connection] Start dialog as affinity activity
Use affinity to keep a clear back stack to prevent caller activity from
stopped stage. If there is only NetworkRequestDialog activity in back stack,
caller will not be covered and then only become paused stage.
Bug:
128995251
Test: manual
Change-Id: I552b942810c919a41a690beff523a01aba1e4d0b
TreeHugger Robot [Thu, 21 Mar 2019 05:48:17 +0000 (05:48 +0000)]
Merge "[Network Connection] Implement Unavailable callback when the user cancels"
Chen Xu [Thu, 21 Mar 2019 05:39:19 +0000 (05:39 +0000)]
Merge "Create TM for each subId to register phonestatelistner"
TreeHugger Robot [Thu, 21 Mar 2019 05:30:35 +0000 (05:30 +0000)]
Merge "[Issue fix] Hearing aids subtitle status is not updated."
cosmohsieh [Wed, 20 Mar 2019 06:48:32 +0000 (14:48 +0800)]
[Network Connection] Don't dismiss dialog when touching outside of
dialog
To Improve user experience, prevent dialog dismissing from touching outside
of the dialog
Bug:
128877712
Test: atest NetworkRequestDialogFragment
Change-Id: Idfa90c3647f5cf766aaa63fdb8a829fec5db5934
TreeHugger Robot [Thu, 21 Mar 2019 04:45:23 +0000 (04:45 +0000)]
Merge "Use "Disable"/"Enable" for system app"
lucaslin [Wed, 20 Mar 2019 03:41:21 +0000 (11:41 +0800)]
Modify dialog message for partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.
Bug:
113450764
Bug:
128489091
Test: 1. Build pass.
2. make -j44 RunSettingsRoboTests
ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
3. Change captive_portal_https_url to https://invalid.com
to simulate partial connectivity.
Change-Id: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
Merged-In: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
TreeHugger Robot [Thu, 21 Mar 2019 04:02:48 +0000 (04:02 +0000)]
Merge "Remove hardcoded height for SliceView"
Arc Wang [Wed, 20 Mar 2019 10:40:28 +0000 (18:40 +0800)]
Add divider line in Preference for scan QR code button and share hotspot button
Bug:
128940862
Test: manual test
Change-Id: If576f0840cc8924b63348f04fe12c3a0d4edcb89
Raff Tsai [Thu, 21 Mar 2019 02:48:18 +0000 (02:48 +0000)]
Revert "Import statsdprotolite library to use atoms.proto"
This reverts commit
7ba77ceadff702b2150185064014cebb86416406.
Reason for revert: <increase settings apk size>
Change-Id: I39bfebf3f50f997d7b36ed80ac6302a4529a6432
Lucas Lin [Thu, 21 Mar 2019 02:34:03 +0000 (02:34 +0000)]
Merge "Modify dialog message for partial connectivity"
Yanting Yang [Thu, 21 Mar 2019 02:04:22 +0000 (02:04 +0000)]
Merge "Improve notification slice string on home page"
Mady Mellor [Thu, 21 Mar 2019 01:59:39 +0000 (18:59 -0700)]
Update bubbles strings in settings
Test: manual - check that the strings are right
Change-Id: I9aeb80abb868ff73bbb9b1481d8f3793a6b451e5