Doris Ling
b458f46438
Merge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev
2016-06-17 18:15:58 +00:00
Jason Monk
ca26435ca0
Merge \"Protect against crash in memory details\" into nyc-dev
...
am: c3ec1ab889
2016-06-17 17:52:01 +00:00
Jason Monk
2ca05240fd
Make sure screen pinning desc is part of view hierarchy
...
am: 0c2ccba2f9
2016-06-17 17:52:01 +00:00
Jason Monk
c3ec1ab889
Merge "Protect against crash in memory details" into nyc-dev
2016-06-17 17:22:03 +00:00
Jason Monk
7a19965c9f
Protect against crash in memory details
...
Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes: 29308942
2016-06-17 10:12:37 -04:00
Jason Monk
0c2ccba2f9
Make sure screen pinning desc is part of view hierarchy
...
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes: 29243233
2016-06-17 10:05:06 -04:00
Adrian Roos
bd470255d0
resolve merge conflicts of 333ba2d to nyc-mr1-dev
...
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
2016-06-16 18:54:50 -07:00
Ajay Kumar Nadathur Sreenivasan
eddcd7d085
Merge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev
2016-06-17 01:18:00 +00:00
Meng Wang
184753f64f
Hide 'Update Emergecy Address' preference w/o carrier support
...
Bug: 29256401
Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7
2016-06-16 17:32:20 -07:00
Adrian Roos
333ba2df01
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
2016-06-16 23:33:56 +00:00
Fan Zhang
37d4d0c80e
Use metrics defined by proto in new Settings tabs.
...
Bug: 28141203
Change-Id: Ia0c566f873f93e46203d19f35161bb98acc60a38
2016-06-16 16:24:20 -07:00
Maurice Lam
0707fdc2e0
Center pattern lock screen vertically
...
Pull the header into the content area, so that the pattern view on
the right side can be centered overall, rather than centered starting
below the title.
Bug: 24405946
Change-Id: I6c9cfe8175014e40c9e1fc78d4c15e027860d8fe
2016-06-16 16:16:25 -07:00
Maurice Lam
223d45ea0e
Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev
2016-06-16 22:00:20 +00:00
Ajay Nadathur
7dfa323c81
[SetupWizard] Fix talkback on lock screen.
...
- On volantis, talkback will now speak 'Protect your tablet' instead of
'Choose screen lock'
Testing:
-------
- Tested and verified on volantis
Change-Id: If010ab8f3fcd107b99294081765a52e98ed8cc1f
2016-06-16 14:42:22 -07:00
Yohei Yukawa
75778049ba
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
...
am: db6f1f2cb5
2016-06-16 21:40:53 +00:00
Yohei Yukawa
db6f1f2cb5
Merge "Teach hard keyboard settings about correct user ID" into nyc-dev
2016-06-16 21:24:05 +00:00
Adrian Roos
38e4e5dca6
Remove RemoteInput on lockscreen setting
...
Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
2016-06-16 13:29:11 -07:00
Doris Ling
b1eadb11b4
Add handling for fingerprint swipe in gesture settings.
...
Hide fingerprint swipe setting if it is not supported, and update the
corresponding config when user enable/disable the fingerprint gesture.
Bug: 28565958
Change-Id: I5a124d3b6933ea6d3aadceaa0eecaa4bee2ccd9d
2016-06-16 12:30:53 -07:00
Maurice Lam
d189ac52a4
Use GLIF theme for Settings > Security > Screen lock
...
Bug: 24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
2016-06-16 12:13:11 -07:00
Doris Ling
600a1eeec5
Merge "Update gesture related settings in Display." into nyc-mr1-dev
2016-06-16 18:52:31 +00:00
Doris Ling
d0c8fd724d
Update gesture related settings in Display.
...
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.
Bug: 28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
2016-06-16 10:23:49 -07:00
TreeHugger Robot
96e8845438
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-16 10:35:08 +00:00
Bill Yi
fbd0f53df1
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 32b427b137
2016-06-16 10:28:56 +00:00
TreeHugger Robot
32b427b137
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-16 10:25:12 +00:00
Bill Yi
13cee79077
Import translations. DO NOT MERGE
...
Change-Id: Ib6520ea1418dac76ad17a77c0ddd393cc7a41938
Auto-generated-cl: translation import
2016-06-16 02:03:59 -07:00
Bill Yi
95fda91511
Import translations. DO NOT MERGE
...
Change-Id: I9909b1c75f95258630ca3b014768b5a7afcd8411
Auto-generated-cl: translation import
2016-06-16 01:52:41 -07:00
Yohei Yukawa
966476b7dc
Teach hard keyboard settings about correct user ID
...
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD is a per-user settings.
PhysicalKeyboardFragment needs to use the current user's ID rather than
hard-coded user ID 0.
Bug: 29406181
Change-Id: Ie40f729f3c85e9ce9ad8f957caba338786b119d9
2016-06-16 00:02:01 -07:00
Roozbeh Pournader
7d9cdfd4b6
BidiFormat adapter name for bluetooth_is_visible_message
...
am: 77893a4c4b
2016-06-16 01:59:37 +00:00
Daniel Nishi
3d040e55d9
Merge "Show storage manager settings using a system property." into nyc-mr1-dev
2016-06-15 22:14:09 +00:00
Roozbeh Pournader
77893a4c4b
BidiFormat adapter name for bluetooth_is_visible_message
...
Previously, adapter names which tend to be LTR and may appear at the
beginning of the string could cause the detected bidi direction of the whole
string (which would be RTL in RTL locales) to get miscalculated as LTR.
With this fix, not only the detected bidi direction would be correct,
but also odd adapter names would not impact the bidi layout of the
whole string.
Bug: 28816891
Change-Id: I1d25edbeeff7e9c013bb6c741e7f706431e721dc
2016-06-15 14:46:11 -07:00
Chris Wren
0a13cfbf8e
Merge \"log as counters instead of histograms\" into nyc-dev
...
am: 6913b6118f
2016-06-15 18:17:52 +00:00
TreeHugger Robot
6913b6118f
Merge "log as counters instead of histograms" into nyc-dev
2016-06-15 18:13:53 +00:00
Daniel Nishi
0074855229
Show storage manager settings using a system property.
...
This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.
Bug: 29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3
2016-06-15 11:01:58 -07:00
Maurice Lam
a028010c23
Merge "Update UI style for GLIF buttons" into nyc-mr1-dev
2016-06-15 17:07:54 +00:00
Maurice Lam
e33872772c
Merge "Fingerprint string updates" into nyc-mr1-dev
2016-06-15 17:07:27 +00:00
Jason Monk
2f4c80f3c7
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
...
am: b53117f55c
2016-06-15 16:59:09 +00:00
TreeHugger Robot
b53117f55c
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
2016-06-15 16:48:45 +00:00
Ricky Wai
5ec65517a6
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
...
am: 42cbbc3052
2016-06-15 16:38:28 +00:00
Jason Monk
b2e2007766
Merge "resolve merge conflicts of f4ad443 to nyc-mr1-dev" into nyc-mr1-dev
2016-06-15 16:37:16 +00:00
Chris Wren
1753dfd5cd
log as counters instead of histograms
...
this will interoperate better with UMA
Bug: 26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
2016-06-15 12:36:38 -04:00
Fan Zhang
1c6674dbb2
Merge "Remove forum link from support tab." into nyc-mr1-dev
2016-06-15 16:15:54 +00:00
Ricky Wai
42cbbc3052
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
2016-06-15 16:02:18 +00:00
Jason Monk
90bde71e20
resolve merge conflicts of f4ad443 to nyc-mr1-dev
...
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
2016-06-15 11:31:14 -04:00
Jason Monk
c7959f91d5
Fix SimStatus updatePhoneInfos
...
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.
Also return the right view in onCreateView
Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes: 29335528
2016-06-15 10:54:33 -04:00
Jason Monk
f4ad4434f1
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
2016-06-15 14:53:43 +00:00
Maurice Lam
4659661821
Fingerprint string updates
...
Bug: 29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999
2016-06-14 19:14:37 -07:00
Maurice Lam
52ae1eb04b
Update UI style for GLIF buttons
...
Bug: 29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725
2016-06-14 18:35:37 -07:00
Julia Reynolds
f04499b2e1
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
2016-06-14 22:30:19 +00:00
TreeHugger Robot
b2301cb4c2
Merge "Prevent users from blocking system notifications." into nyc-dev
2016-06-14 22:25:26 +00:00
Fan Zhang
156453c0ad
Remove forum link from support tab.
...
Bug: 29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244
2016-06-14 13:01:45 -07:00
