Fan Zhang
0beb695999
Add a "Do not show" checkbox in support disclaimer dialog.
...
Bug: 28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
2016-06-17 12:56:35 -07:00
Doris Ling
a617c80bac
Merge \\"Add handling for fingerprint swipe in gesture settings.\\" into nyc-mr1-dev am: b458f46438
...
am: 6bf5f1e84a
2016-06-17 18:56:11 +00:00
Jason Monk
6de5d6c5f2
Merge \\\"Protect against crash in memory details\\\" into nyc-dev am: c3ec1ab889 am: ca26435ca0
...
am: 540f55b272
2016-06-17 18:56:10 +00:00
Jason Monk
4a65aa3540
Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9 am: 2ca05240fd
...
am: 108b3c2879
2016-06-17 18:56:09 +00:00
Jason Monk
60aac91c64
Merge \\\"Protect against crash in memory details\\\" into nyc-dev am: c3ec1ab889 am: 989a52dc8d
...
am: 07e52aeb1c
2016-06-17 18:55:34 +00:00
Jason Monk
0a96193e46
Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9 am: 11bad8d93e
...
am: ac0b7dd4e7
2016-06-17 18:55:33 +00:00
Adrian Roos
a605f76a08
resolve merge conflicts of 333ba2d to nyc-mr1-dev am: bd470255d0
...
am: 1e26d10308
2016-06-17 18:55:32 +00:00
Bill Yi
daf1acec36
Import translations. DO NOT MERGE am: 5820d03643 -s ours am: 86f3cf9bc9 -s ours
...
am: c08df6766c
2016-06-17 18:55:31 +00:00
Adrian Roos
6f23c0493a
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
...
am: fa2bbcc288
2016-06-17 18:55:31 +00:00
Ajay Kumar Nadathur Sreenivasan
53bded5da2
Merge \\"[SetupWizard] Fix talkback on lock screen.\\" into nyc-mr1-dev am: eddcd7d085
...
am: 10c74d81df
2016-06-17 18:54:54 +00:00
Maurice Lam
306cec109d
Center pattern lock screen vertically am: 0707fdc2e0
...
am: 00a6fd6df2
2016-06-17 18:54:52 +00:00
Maurice Lam
f438a1a423
Merge \\"Use GLIF theme for Settings > Security > Screen lock\\" into nyc-mr1-dev am: 223d45ea0e
...
am: 47e38646ed
2016-06-17 18:54:51 +00:00
Yohei Yukawa
56bcc06b1e
Merge \"Merge \\\"Teach hard keyboard settings about correct user ID\\\" into nyc-dev am: db6f1f2cb5 am: cfe0f07499\" into nyc-mr1-dev-plus-aosp
...
am: c54df7910a
2016-06-17 18:54:50 +00:00
Yohei Yukawa
887b19d846
Merge \\\"Teach hard keyboard settings about correct user ID\\\" into nyc-dev am: db6f1f2cb5 am: 75778049ba
...
am: a95348d6c1
2016-06-17 18:54:48 +00:00
Doris Ling
6bf5f1e84a
Merge \"Add handling for fingerprint swipe in gesture settings.\" into nyc-mr1-dev
...
am: b458f46438
2016-06-17 18:20:38 +00:00
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
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
