Commit Graph

13047 Commits

Author SHA1 Message Date
Alison Cichowlas
3e5c6f718a 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
am: 4010eb294f

Change-Id: Iaa85e2d06431bd92886aafc8b94b36c20de46eef
2017-08-31 20:23:27 +00: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
TreeHugger Robot
49d25a0506 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 2017-08-31 19:51:50 +00:00
Fan Zhang
42614f1805 Misc icon updates am: 24dc1ab39e
am: cfe72f13dc

Change-Id: I5d311d247199e5cb05b2e9460f47a42cd34aec62
2017-08-31 04:44:02 +00:00
Fan Zhang
cfe72f13dc Misc icon updates
am: 24dc1ab39e

Change-Id: I3db014aa9b51b12226d9f616de73f757cd6f9dd4
2017-08-31 03:24:36 +00:00
Fan Zhang
24dc1ab39e Misc icon updates
Fixes: 65204006
Test: visual
Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7
2017-08-30 17:06:17 -07:00
Bill Yi
ef5d680cc4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I334be8406b13c2b00047753ed84f62cf6ae71fbd
2017-08-29 14:36:06 -07:00
TreeHugger Robot
69ad36d628 Merge "Modify notification string." 2017-08-29 17:59:32 +00:00
yuemingw
6b6d9fd979 Modify notification string.
Bug: 30432840
Test: Reproduced the problem by clicking 'Install from SD card' and the
new notification string appears instead of the old one.

Change-Id: I38a6fc6212aa283f8a899c28db81d8dae4245396
2017-08-29 14:06:31 +01:00
Jack He
7bef28df2d Bluetooth: Only show devices when their names are resolved am: 19ba320263
am: 7a6aadce4b

Change-Id: I93ab225467dfbb51c77ea9dfde0e3082a845624c
2017-08-26 03:03:03 +00:00
Jack He
7a6aadce4b Bluetooth: Only show devices when their names are resolved
am: 19ba320263

Change-Id: I23300ac9541f88b3aeb978be0771e93b85fe834f
2017-08-26 02:51:48 +00:00
Jack He
19ba320263 Bluetooth: Only show devices when their names are resolved
* Add a developer menu option to allow name-less devices to be shown
  when a Bluetooth developer needs it, but hide it for non-developer
  users.
* Set BluetoothDevicePreference to invisible when CachedBluetoothDevice
  does not have a name besides MAC address and the above developer option
  is false.
* This affects BluetoothPairingDetail and DevicePickerFragment, but does
  not affect BluetoothSettings. BluetoothSettings will show all paired
  devices regardless whether an user friendly name exists.

Bug: 34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: Idd7ad4b1671dfdcf3204efb50eddb6dae1065aa5
2017-08-25 16:27:30 -07:00
jackqdyulei
c26876ade7 Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
am: 77bd8c3a73

Change-Id: I36f5729dd042c88c9f8d6a2d4abf720a05748246
2017-08-25 18:37:53 +00:00
Maurice Lam
7d5919dd04 Merge "Fix typo in fingerprint string" 2017-08-25 00:31:02 +00:00
jackqdyulei
7661137981 Add battery indicator to bluetooth icon
This cl change util method in bluetooth package to return
drawable instead of resId.

If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.

Bug: 63393322
Test: RunSettingsRoboTests

Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
Merged-In: Ib21822eafda0e8570212ce5cb070478e4f4876a2
2017-08-24 16:53:01 -07:00
jackqdyulei
6f5c990abd Add battery indicator to bluetooth icon
This cl change util method in bluetooth package to return
drawable instead of resId.

If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.

Bug: 63393322
Test: RunSettingsRoboTests

Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
2017-08-24 20:50:10 +00:00
Maurice Lam
be1bc679c2 Fix typo in fingerprint string
Test: Manual
Bug: 65017285
Change-Id: I3664cc4b888c4c573b439f06f1ef9983d0470674
2017-08-24 19:40:30 +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
Bill Yi
ed1712a7ef Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I5ac7b8c39cb58c662a744ac1c0608ed901fb670e
2017-08-23 21:58:28 -07:00
Bill Yi
4189d7f66c Import translations. DO NOT MERGE
Change-Id: Ie2c072d206c99da9b6fc821012a7a4056020aaaf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-23 21:40:56 -07:00
Kevin Chyn
47784a1cb0 Merge "Pattern entry views should be consistent" into oc-mr1-dev am: a6b67d15eb
am: d328b9051c

Change-Id: Ie2d3605d0cf6d8057981d48bdabb0e67645e0a34
2017-08-23 03:52:09 +00:00
Kevin Chyn
d328b9051c Merge "Pattern entry views should be consistent" into oc-mr1-dev
am: a6b67d15eb

Change-Id: Icb5ec09a66aadf48a81f33d57aacbb52d05f9c2f
2017-08-23 01:43:12 +00:00
TreeHugger Robot
a6b67d15eb Merge "Pattern entry views should be consistent" into oc-mr1-dev 2017-08-23 00:24:13 +00:00
Tony Mak
35efb10206 Merge "A separate entry for work profile CA cert" into oc-mr1-dev am: e040ef4a39
am: 237e49a7c9

Change-Id: I2b90fdcd5a6c88600077a0b09e693b006bf53177
2017-08-22 18:24:05 +00: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
Kevin Chyn
e4cfb6a594 Pattern entry views should be consistent
This change makes confirm_pattern consistent with choose_pattern

Fixes: 27290562

Test: manual
Change-Id: Id56492df71624552c8362f648756ba64bf908965
2017-08-22 01:16:08 +00:00
TreeHugger Robot
8ae8b7a931 Merge "Index TTS-Settings and dedupe TTS-engine in search result." 2017-08-17 17:30:19 +00:00
TreeHugger Robot
682ff5562c Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-17 15:33:39 +00:00
Maurice Lam
3e8718af51 Merge "Add fingerprint illustration image" into oc-mr1-dev am: 89c2adf420
am: 1b6307a9cc

Change-Id: Icb102ad71236e6f71e5994306da6c84da461d2fc
2017-08-17 07:16:24 +00:00
Maurice Lam
a4b54e52ba Merge "Fix bad string reference" into oc-mr1-dev am: f4716e89c0
am: f7a818345d

Change-Id: I3c9bb76c5c986d58e2b91ae25cdb2a7333d78249
2017-08-17 07:13:41 +00:00
Fan Zhang
7e5055b30c Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev am: 9a03b951d2
am: 5c15a79fa4

Change-Id: I28d8eb7ee38102dd74b5b307f45d17ce77476878
2017-08-17 07:12:51 +00:00
Maurice Lam
1b6307a9cc Merge "Add fingerprint illustration image" into oc-mr1-dev
am: 89c2adf420

Change-Id: I44edca5a3310e476dd68e25e0e16560bb5a31b5f
2017-08-17 01:23:19 +00:00
Maurice Lam
f7a818345d Merge "Fix bad string reference" into oc-mr1-dev
am: f4716e89c0

Change-Id: I8f0a632761f30aff990dad51cff99f0a7907b94c
2017-08-17 01:21:10 +00:00
Fan Zhang
5c15a79fa4 Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
am: 9a03b951d2

Change-Id: If754d6e11ef3d39d716b41a3219a5d30c48fc218
2017-08-17 01:20:19 +00:00
TreeHugger Robot
89c2adf420 Merge "Add fingerprint illustration image" into oc-mr1-dev 2017-08-17 00:49:00 +00:00
Maurice Lam
f4716e89c0 Merge "Fix bad string reference" into oc-mr1-dev 2017-08-16 23:33:43 +00:00
Fan Zhang
18a168239e Index TTS-Settings and dedupe TTS-engine in search result.
Fixes: 63022866
Test: robotests
Change-Id: I5c711e7bafba4e413ee271768c58742be05d8640
2017-08-16 15:46:41 -07:00
Fan Zhang
875b8eae39 Remove gibberish summary in search when query is "lock"
Fixes: 64165687
Test: visual for search
Test: rerun robotest for securitysettings
Change-Id: I5c44e351a767c7ce3037a81d0932d9bd6b59635e
2017-08-16 22:12:44 +00:00
Maurice Lam
6c108ca693 Merge "Use default primary color for choose lock screens" into oc-mr1-dev am: 595627c630
am: 4db65eab00

Change-Id: I0d101f0c14572be3f8885e4a02dcb0119b4059ed
2017-08-16 22:10:01 +00:00
Maurice Lam
209410dd2a Fix bad string reference
The source string was removed but there are still references to it.
Updating the references as well in this CL.

Test: mma with ANDROID_AAPT_IGNORE on locale files
Bug: 64763091
Change-Id: I43ef63207e884cbaa92ff3853b0f1fd690cf05f8
2017-08-16 13:39:12 -07:00
Fan Zhang
0654a22578 Merge "Stub out feature flag UI" 2017-08-16 20:27:14 +00:00
Maurice Lam
2bc609a1bd Add fingerprint illustration image
Test: Manual
Bug: 38210310
Change-Id: I95b4940792c172cf866f71c0fef9859e69d60074
2017-08-16 11:44:19 -07: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
2c43d273b8 Merge "Update strings for screen lock setup" 2017-08-16 17:40:52 +00:00
Bill Yi
cf96c9b13f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: If0ff6ff971291e101e464f028e79fc18afa5b6a7
2017-08-15 21:53:30 -07: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
Fan Zhang
75cd1d2010 Stub out feature flag UI
Bug: 36222960
Test: make -j40 RunSettingsRoboTests
Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53
2017-08-15 17:42:58 -07:00
Fan Zhang
0764a663fc Merge "Compute aspect ratio properly" 2017-08-15 23:37:59 +00:00
Fan Zhang
36717d4399 Compute aspect ratio properly
Change-Id: Ic4e1f20f7354b9ab5f4e9c7564d16d06324ec23d
Fixes: 64608152
Test: visual
2017-08-15 11:14:58 -07:00