Jason Monk
|
0ceacec553
|
Fix focusability of battery history chart am: 9c6ab88bd7 am: b363eb89bc
am: b6af413f8b
Change-Id: I160a01e21771ba120b646cff796a1539216de9db
|
2016-06-20 17:57:05 +00:00 |
|
Jason Monk
|
b6af413f8b
|
Fix focusability of battery history chart am: 9c6ab88bd7
am: b363eb89bc
Change-Id: Ibdb83d13677d9101264593e2220b9d18fc261fc9
|
2016-06-20 17:38:19 +00:00 |
|
Fan Zhang
|
a659b1110a
|
Merge \\"Add a \\"Do not show\\" checkbox in support disclaimer dialog.\\" into nyc-mr1-dev am: d04b49649e
am: 461b286de7
Change-Id: I7e06d1fe4be7d74b5a330be164d57f253b1a511f
|
2016-06-20 17:36:22 +00:00 |
|
Jason Monk
|
b363eb89bc
|
Fix focusability of battery history chart
am: 9c6ab88bd7
Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c
|
2016-06-20 17:29:24 +00:00 |
|
Fan Zhang
|
461b286de7
|
Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
am: d04b49649e
Change-Id: I25ff49cb0ce6ab6cb4cfb35aef254d3881e343e1
|
2016-06-20 17:25:45 +00:00 |
|
Fan Zhang
|
d04b49649e
|
Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
|
2016-06-20 16:35:52 +00:00 |
|
Jason Monk
|
9c6ab88bd7
|
Fix focusability of battery history chart
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes: 29453492
|
2016-06-20 11:04:43 -04:00 |
|
Meng Wang
|
ffb4f8a058
|
Merge \\"Hide \\'Update Emergecy Address\\' preference w/o carrier support\\" into nyc-mr1-dev am: 2a817d97fe
am: 8008dee36c
Change-Id: I5551238b5fc0eee189c0183aec7d7addacad678c
|
2016-06-18 04:15:55 +00:00 |
|
Meng Wang
|
8008dee36c
|
Merge \"Hide \'Update Emergecy Address\' preference w/o carrier support\" into nyc-mr1-dev
am: 2a817d97fe
Change-Id: Iccf8008b7a818bf8327e8e53632326dd0dc41982
|
2016-06-18 04:12:40 +00:00 |
|
TreeHugger Robot
|
2a817d97fe
|
Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
|
2016-06-18 04:02:49 +00:00 |
|
Fan Zhang
|
39d2e1f916
|
resolve merge conflicts of 057f4ae to master
Change-Id: I609b04b174195b2396ee5918990b03d737ad0067
|
2016-06-17 15:40:48 -07:00 |
|
Fan Zhang
|
057f4ae6cc
|
Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
am: b2728f51fb
Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea
|
2016-06-17 20:20:54 +00:00 |
|
Fan Zhang
|
b2728f51fb
|
Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev
|
2016-06-17 20:15:48 +00:00 |
|
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
Change-Id: Ida043d486ab1ebb1173f076a9476baf34102ed2b
|
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
Change-Id: I51c47b917cb881e28048b64993c4be79a63099ad
|
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
Change-Id: I6a3b19fe30b19d7523a99e473257f64533342a63
|
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
Change-Id: I601ba95f6bab1cf53e56a866300dae96d0b9f4d5
|
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
Change-Id: I1c42b58359636987aec1c430bbec94f7c34250b8
|
2016-06-17 18:55:33 +00:00 |
|
Adrian Roos
|
a605f76a08
|
resolve merge conflicts of 333ba2d to nyc-mr1-dev am: bd470255d0
am: 1e26d10308
Change-Id: Ib995f67ce9347f2b4d68a8e6a7bac51e8574c4bb
|
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 -s ours
Change-Id: Ie46f9e196ca527b119c6797ae546e8d6d44a48d9
|
2016-06-17 18:55:31 +00:00 |
|
Adrian Roos
|
6f23c0493a
|
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
am: fa2bbcc288
Change-Id: Ia76e98cf5b8a94a36d77a326ce37bf31ae34a3bb
|
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
Change-Id: Iae70d32d3af03888e02e4ba67fef9486e723329a
|
2016-06-17 18:54:54 +00:00 |
|
Maurice Lam
|
306cec109d
|
Center pattern lock screen vertically am: 0707fdc2e0
am: 00a6fd6df2
Change-Id: I4ab4ae5c1ef5695038976cf6cd8034193ee81ed2
|
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
Change-Id: If8a44dee9ba11281c9cc62b16b3599655c94724a
|
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
Change-Id: I115a64d939ac4a0cc3725d7f1a97726bee353652
|
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
Change-Id: I5c922c8cb5f51bb9072b6c1802ca789ce6a6975b
|
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
Change-Id: I3ad94884053f7d3788c06ef7d75b4f40f7b46758
|
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
Change-Id: Ib5c782a3044161923c91aa8b5fb1fa31dedc9b09
|
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
Change-Id: I8b2fb6adf8959d0504b17f8ad2a3c3f33a797da3
|
2016-06-17 17:55:03 +00:00 |
|
Jason Monk
|
ca26435ca0
|
Merge \"Protect against crash in memory details\" into nyc-dev
am: c3ec1ab889
Change-Id: If36b3350e0694ffae3086be9307295c4516828dd
|
2016-06-17 17:52:01 +00:00 |
|
Jason Monk
|
2ca05240fd
|
Make sure screen pinning desc is part of view hierarchy
am: 0c2ccba2f9
Change-Id: Iac6d8d4df22fb8e32e61ad25aed06e079d1fa348
|
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
Change-Id: I09960da265e426c58fc651d3c9b932f20633f1fb
|
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
Change-Id: I1235d2ae35600c71f92d69f1f4475a3b70efeef1
|
2016-06-17 17:47:25 +00:00 |
|
Jason Monk
|
989a52dc8d
|
Merge \"Protect against crash in memory details\" into nyc-dev
am: c3ec1ab889
Change-Id: I64ec49c820c21971056b342908a1e0c33d394d72
|
2016-06-17 17:44:25 +00:00 |
|
Jason Monk
|
11bad8d93e
|
Make sure screen pinning desc is part of view hierarchy
am: 0c2ccba2f9
Change-Id: I20e98baa0be229a72673ef18eccd35bc713f75ad
|
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
Change-Id: I8013125ea8560c8d0b0cd972536316a394859cca
|
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 -s ours
Change-Id: If4bd213c1a985740be4c1fb1fc5b8fd03ca2359f
|
2016-06-17 06:59:43 +00:00 |
|
Bill Yi
|
86f3cf9bc9
|
Import translations. DO NOT MERGE
am: 5820d03643 -s ours
Change-Id: I112e5d37b0e2bea442ddeb9431864ab06c983f6b
|
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
Change-Id: I8b4780b65a3088b3b7937d9c88326ace67a9e90d
|
2016-06-17 01:45:44 +00:00 |
|
Maurice Lam
|
00a6fd6df2
|
Center pattern lock screen vertically
am: 0707fdc2e0
Change-Id: I28031ebfff2c09171ff948636e2961422ea70898
|
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
Change-Id: Ib9419acf4b09dd17fd15b53d32ce4616cbec94fa
|
2016-06-16 23:41:25 +00:00 |
|