Commit Graph

5206 Commits

Author SHA1 Message Date
Antony Sargent
5f4e32ae5f Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7 am: fe20f69e3f
am: 51950965e9

Change-Id: I30014b81a3eb514caf030ea5efb72694f434e305
2017-12-05 23:23:05 +00:00
Antony Sargent
51950965e9 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7
am: fe20f69e3f

Change-Id: I1d1eb74920d9b191bb7f0365620d0dd1d372b923
2017-12-05 23:17:11 +00:00
Antony Sargent
fe20f69e3f Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9
am: 26e5f828f7

Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a
2017-12-05 23:10:05 +00:00
Antony Sargent
26e5f828f7 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
am: db6e747ab9

Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
2017-12-05 17:32:41 +00:00
Antony Sargent
9867a3ef85 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
am: 3d7dbd6407

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
am: 24f063a207

Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
am: 9cf1fc73f1

Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
am: eee62e1846

Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846 Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3 Reword bluetooth confirmation dialog
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
2017-12-05 17:13:36 +00:00
Chien-Yu Chen
890c9a7ad3 Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
am: fa3af7b0e7

Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
2017-12-03 03:28:40 +00:00
Chien-Yu Chen
7bae205499 Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
2017-12-01 08:11:56 -08:00
Bruno Martins
440373dbde Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26
am: 7431ad3a80

Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
2017-11-15 21:56:18 +00:00
Bruno Martins
7431ad3a80 Merge "Settings: Add notification channel for SIM selection"
am: c543d5ba26

Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
2017-11-15 21:54:16 +00:00
Antony Sargent
e14d38a383 Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.

Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)

Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
2017-11-15 18:38:43 +00:00
Bruno Martins
4c7070241a Settings: Add notification channel for SIM selection
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
2017-11-14 22:28:59 +00:00
Malcolm Chen
bd124449c0 Updates strings for "Emergency broadcast".
Replace "Emergency broadcast" with "Emergency alerts" to be
consistent.

Test: manual
Bug: b/62291344
Change-Id: I79d6f1162d4c112dedf49a3b43ec26011adba9bf
2017-11-01 16:49:36 -07:00
Fan Zhang
a12b3d318d Add strings to support multi-state vivid color management
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit e1543a3895)
2017-10-26 10:10:46 -07:00
Fan Zhang
bb6efe3743 Add strings to support multi-state vivid color management
am: e1543a3895

Change-Id: Icc99c1e3348425d70fea3235a4d4c63385c3d38f
2017-10-24 00:27:02 +00:00
Fan Zhang
e1543a3895 Add strings to support multi-state vivid color management
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
2017-10-23 23:45:47 +00:00
Emilian Peev
11179290a2 Merge "Settings: Add laser sensor preference" into oc-mr1-dev
am: 22eb007eea

Change-Id: I34ab89bd2a175aa77a78a9a46aea75f148bab284
2017-09-13 08:40:10 +00:00
TreeHugger Robot
22eb007eea Merge "Settings: Add laser sensor preference" into oc-mr1-dev 2017-09-13 07:19:35 +00:00
Maurice Lam
4f61cfb967 Merge "Fix sizing of pattern view" into oc-mr1-dev
am: adef5b23e0

Change-Id: I63928a5e53bf15b30d50f28fa9c4518503d005d7
2017-09-11 20:09:55 +00:00
Maurice Lam
7efcc35d85 Fix sizing of pattern view
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)

Test: Manual
Bug: 64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
2017-09-11 20:07:17 +00:00
debesay guadad
5b1651b3bb Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.

Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 23:24:53 +00:00
debesay guadad
96dc322901 Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.

Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 20:59:32 +00:00
Emilian Peev
6530b21cc5 Settings: Add laser sensor preference
Add a switch for enabling/disabling the laser sensor within
developer options.

Test: Manual using setting app, RunSettingsRoboTests
Bug: 64423712
Change-Id: I89a32dfa062fc62c4be096d2e026a32ce9b784ca
2017-09-07 08:54:58 +01:00
Alison Cichowlas
4010eb294f Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
am: 49d25a0506

Change-Id: I3cd8b74fd35dbbdb73512a15f368a527119a9c20
2017-08-31 20:10:19 +00:00
Alison Cichowlas
c3570914f6 Legacy channels say "allow sound" instead of "let the app decide".
We had this string already translated from use in previous ux revs.

Change-Id: I91a9ce001a0d875c0ae12643e6b386328e9cd8de
Fixes: 62873496
Test: String change, manually verified
2017-08-24 15:02:21 -04:00
Tony Mak
237e49a7c9 Merge "A separate entry for work profile CA cert" into oc-mr1-dev
am: e040ef4a39

Change-Id: I0774c8e5ebf959b5f6fb759566815bde966c0dfd
2017-08-22 18:21:35 +00:00
Tony Mak
c74bbcd3b2 A separate entry for work profile CA cert
We mixed both primary and work profile CA certs into single entry
previously which is not aligned with the CTS requirement.
Separate them from now.

Test: m -j RoboSettingsTest
Test: Run related manual test in CtsVerifier

Bug: 64567417

Change-Id: Iaff2d9f25ef15b96c11727e7075bdae8e90ec8ce
2017-08-22 18:24:30 +01:00
Maurice Lam
4db65eab00 Merge "Use default primary color for choose lock screens" into oc-mr1-dev
am: 595627c630

Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4
2017-08-16 18:30:22 +00:00
Maurice Lam
e9a6e8f1e5 Use default primary color for choose lock screens
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.

Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
2017-08-15 19:30:14 -07:00
Jesse Evans
eee0e82fba Merge "Change strings from Instant app account to setting" into oc-mr1-dev
am: 858ea46a3a

Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd
2017-08-15 01:37:07 +00:00
Jesse Evans
804b0daf49 Change strings from Instant app account to setting
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2 Update strings for screen lock setup
am: 3eb4c8333e

Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e Update strings for screen lock setup
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
Ajay Nadathur
aec29ee4be Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
2017-08-11 17:21:24 +00:00
Ajay Nadathur
58c2da2d9e Update strings for skip fingerprint setup
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
Fan Zhang
1e61f91d7b Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
am: 0dc85bcc1e

Change-Id: I3942d07dd5c0acd5640ad50b7311ba15177f5a6d
2017-08-10 00:44:59 +00:00
Fan Zhang
3fc194017d Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes: 64342027
Test: visual
2017-08-09 13:57:37 -07:00
Ajay Nadathur
b9c3eb954a Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am: 0ed0319005

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
2017-08-09 20:27:45 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00
Adrian Roos
1d192addc6 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
am: a147d4a616

Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
2017-08-09 13:55:00 +00:00
TreeHugger Robot
a147d4a616 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev 2017-08-09 13:36:40 +00:00
Adrian Roos
6600ddec73 FRP: Add dedicated explanation strings for ConfirmCredential
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes: 63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
2017-08-09 11:08:13 +00:00
Eric Schwarzenbach
06917056fd Merge "Add modify string to resources." into oc-mr1-dev
am: 9e47d2c233

Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68
2017-08-09 01:04:33 +00:00
TreeHugger Robot
9e47d2c233 Merge "Add modify string to resources." into oc-mr1-dev 2017-08-09 00:46:57 +00:00
Eric Schwarzenbach
b82f51099a Add modify string to resources.
Bug: 36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
2017-08-08 14:11:51 -07:00