Jason Monk
540f55b272
Merge \\"Protect against crash in memory details\\" into nyc-dev am: c3ec1ab889
...
am: ca26435ca0
2016-06-17 17:55:04 +00:00
Jason Monk
108b3c2879
Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9
...
am: 2ca05240fd
2016-06-17 17:55:03 +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
07e52aeb1c
Merge \\"Protect against crash in memory details\\" into nyc-dev am: c3ec1ab889
...
am: 989a52dc8d
2016-06-17 17:47:25 +00:00
Jason Monk
ac0b7dd4e7
Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9
...
am: 11bad8d93e
2016-06-17 17:47:25 +00:00
Jason Monk
989a52dc8d
Merge \"Protect against crash in memory details\" into nyc-dev
...
am: c3ec1ab889
2016-06-17 17:44:25 +00:00
Jason Monk
11bad8d93e
Make sure screen pinning desc is part of view hierarchy
...
am: 0c2ccba2f9
2016-06-17 17:44:25 +00:00
Jason Monk
c3ec1ab889
Merge "Protect against crash in memory details" into nyc-dev
2016-06-17 17:22:03 +00:00
Adrian Roos
1e26d10308
resolve merge conflicts of 333ba2d to nyc-mr1-dev
...
am: bd470255d0
2016-06-17 17:10:17 +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
Bill Yi
c08df6766c
Import translations. DO NOT MERGE am: 5820d03643 -s ours
...
am: 86f3cf9bc9
2016-06-17 06:59:43 +00:00
Bill Yi
86f3cf9bc9
Import translations. DO NOT MERGE
...
am: 5820d03643
2016-06-17 04:57:59 +00:00
Adrian Roos
fa2bbcc288
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
...
Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a
2016-06-16 18:58:04 -07: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 Nadathur
10c74d81df
Merge \"[SetupWizard] Fix talkback on lock screen.\" into nyc-mr1-dev
...
am: eddcd7d085
2016-06-17 01:45:44 +00:00
Maurice Lam
00a6fd6df2
Center pattern lock screen vertically
...
am: 0707fdc2e0
2016-06-17 01:45:44 +00: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
380b01a00e
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
...
am: 333ba2df01
2016-06-16 23:41:25 +00: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
Bill Yi
5820d03643
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I1c74afef29b0466e699d5b396639484704528120
2016-06-16 15:11:07 -07:00
Maurice Lam
47e38646ed
Merge \"Use GLIF theme for Settings > Security > Screen lock\" into nyc-mr1-dev
...
am: 223d45ea0e
2016-06-16 22:10:10 +00: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
Android Build Merger (Role)
c54df7910a
Merge "Merge \\"Teach hard keyboard settings about correct user ID\\" into nyc-dev am: db6f1f2cb5 am: cfe0f07499" into nyc-mr1-dev-plus-aosp
2016-06-16 21:47:09 +00:00
Yohei Yukawa
3ccd2e95c9
Merge \\"Teach hard keyboard settings about correct user ID\\" into nyc-dev am: db6f1f2cb5
...
am: cfe0f07499
2016-06-16 21:47:02 +00:00
Yohei Yukawa
a95348d6c1
Merge \\"Teach hard keyboard settings about correct user ID\\" into nyc-dev am: db6f1f2cb5
...
am: 75778049ba
2016-06-16 21:46:49 +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
cfe0f07499
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
...
am: db6f1f2cb5
2016-06-16 21:40:53 +00: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
Doris Ling
32d530d6cd
Merge \\"Update gesture related settings in Display.\\" into nyc-mr1-dev am: 600a1eeec5
...
am: 6dc50f9de6
2016-06-16 19:17:44 +00: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
6dc50f9de6
Merge \"Update gesture related settings in Display.\" into nyc-mr1-dev
...
am: 600a1eeec5
2016-06-16 19:07:03 +00: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
Bill Yi
0db0a55b3b
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 96e8845438 -s ours
...
am: 735a8e14c0
2016-06-16 10:41:59 +00:00
Bill Yi
735a8e14c0
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 96e8845438
2016-06-16 10:39:29 +00:00
Bill Yi
5853742b44
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 32b427b137 -s ours am: fbd0f53df1 -s ours
...
am: 124ebc85e7
2016-06-16 10:37:36 +00:00
Bill Yi
01a5b7fb17
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 32b427b137 -s ours am: 748841c8de -s ours
...
am: 8668bb768b
2016-06-16 10:37:36 +00:00
TreeHugger Robot
96e8845438
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-16 10:35:08 +00:00
Bill Yi
124ebc85e7
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 32b427b137 -s ours
...
am: fbd0f53df1
2016-06-16 10:34:19 +00:00
Bill Yi
8668bb768b
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 32b427b137 -s ours
...
am: 748841c8de
2016-06-16 10:32:03 +00:00
Bill Yi
748841c8de
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 32b427b137
2016-06-16 10:28:56 +00:00
Bill Yi
fbd0f53df1
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 32b427b137
2016-06-16 10:28:56 +00:00
