OSDN Git Service
Jason Monk [Wed, 22 Jun 2016 19:11:54 +0000 (19:11 +0000)]
Merge \\"Protect against crash in font size\\" into nyc-dev am:
4b336099f1
am:
bc1764f404
Change-Id: I0808298678eb25b603302c537ca8e9a667fae8bc
Jason Monk [Wed, 22 Jun 2016 19:09:27 +0000 (19:09 +0000)]
Merge \"Protect against crash in font size\" into nyc-dev
am:
4b336099f1
Change-Id: Ida2f0e275cea74516616374b858816f162f76dd3
Jason Monk [Wed, 22 Jun 2016 19:04:16 +0000 (19:04 +0000)]
Merge "Protect against crash in font size" into nyc-dev
Doris Ling [Wed, 22 Jun 2016 17:40:30 +0000 (17:40 +0000)]
Merge \"Remove summary text for Backup & reset.\" into nyc-mr1-dev
am:
e15eb0a263
Change-Id: Ic296e7c997f417a19e06ef782e87837b3066e2dd
Doris Ling [Wed, 22 Jun 2016 17:27:24 +0000 (17:27 +0000)]
Merge "Remove summary text for Backup & reset." into nyc-mr1-dev
Jason Monk [Wed, 22 Jun 2016 17:10:25 +0000 (13:10 -0400)]
Protect against crash in font size
Change-Id: Ib3578e0e82388a4f6aa3eeade0d990fc107b9c14
Fixes:
29438848
Jason Monk [Wed, 22 Jun 2016 15:37:26 +0000 (15:37 +0000)]
Merge \\"Fix tethering re-enable after edit.\\" into nyc-dev am:
dbb5a0b918
am:
cd2d94b2d1
Change-Id: Ifa46a3dce735778e99c115ac6499c71d05a2068b
Jason Monk [Wed, 22 Jun 2016 15:36:36 +0000 (15:36 +0000)]
Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am:
dbb5a0b918
Change-Id: Ia9f2e65710a94f314f8bb2b8ec875088c9ccc59f
Jason Monk [Wed, 22 Jun 2016 15:29:14 +0000 (15:29 +0000)]
Merge \\"Fix tethering re-enable after edit.\\" into nyc-dev am:
dbb5a0b918
am:
c04ac8415a
Change-Id: I130760913149185f5cef084d9a239ad35a4fad04
Jason Monk [Wed, 22 Jun 2016 15:26:29 +0000 (15:26 +0000)]
Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am:
dbb5a0b918
Change-Id: Ib8547ccf2a169c16b6bb0785e7094edbee123af0
Jason Monk [Wed, 22 Jun 2016 15:22:10 +0000 (15:22 +0000)]
Merge "Fix tethering re-enable after edit." into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:39:14 +0000 (13:39 +0000)]
Merge \\"Update battery content descriptions with labels\\" into nyc-dev am:
2a6b3d4db1
am:
a996a46c62
Change-Id: I8a942298ac1cda479cbed919b0000e7d8bb55ec1
Jason Monk [Wed, 22 Jun 2016 13:38:39 +0000 (13:38 +0000)]
Merge \\"Update battery content descriptions with labels\\" into nyc-dev am:
2a6b3d4db1
am:
29e4b2bc30
Change-Id: I018d46e214d2a56ecc0fca5b089bcd81dc6c7c41
Jason Monk [Wed, 22 Jun 2016 13:32:23 +0000 (13:32 +0000)]
Merge \"Update battery content descriptions with labels\" into nyc-dev
am:
2a6b3d4db1
Change-Id: I0e81816f4eb2e99b10d4cbb46d97f0a370159a6c
Jason Monk [Wed, 22 Jun 2016 13:32:21 +0000 (13:32 +0000)]
Merge \"Update battery content descriptions with labels\" into nyc-dev
am:
2a6b3d4db1
Change-Id: Id0d36f67615bd319351ba2bdc3c2993a3162e665
Jason Monk [Wed, 22 Jun 2016 13:22:45 +0000 (13:22 +0000)]
Merge "Update battery content descriptions with labels" into nyc-dev
Andrew Sapperstein [Tue, 21 Jun 2016 23:49:59 +0000 (23:49 +0000)]
Merge \"Update Settings to use DeviceDefault.Settings.\" into nyc-mr1-dev
am:
70ff5f8fa1
Change-Id: I3b556a3f7b0146deadf59b7c8fb244580b060fdf
Andrew Sapperstein [Tue, 21 Jun 2016 23:02:12 +0000 (23:02 +0000)]
Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev
Doris Ling [Tue, 21 Jun 2016 20:23:26 +0000 (13:23 -0700)]
Remove summary text for Backup & reset.
Remove the SummaryProvider from PrivacySettings so that it will not show
the summary for the Backup & reset settings.
Bug:
29519430
Change-Id: Idf41c2f794391f81bf864ade0db9087c2e3e1c0e
Doris Ling [Tue, 21 Jun 2016 19:04:29 +0000 (19:04 +0000)]
Merge \"Add play icon to the gesture settings videos.\" into nyc-mr1-dev
am:
9ca0e6cc86
Change-Id: I542d48564a52b2ae7dd8497cdebde19086fe53bb
Doris Ling [Tue, 21 Jun 2016 18:55:54 +0000 (18:55 +0000)]
Merge "Add play icon to the gesture settings videos." into nyc-mr1-dev
Daniel Sandler [Tue, 21 Jun 2016 18:29:19 +0000 (18:29 +0000)]
Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am:
87fcf9e95f
am:
698fe0a9b0
Change-Id: I4d1d95d66b02d18c6f2ba80b0348895e542ae57f
Daniel Sandler [Tue, 21 Jun 2016 18:28:35 +0000 (18:28 +0000)]
Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am:
87fcf9e95f
am:
7df9a28fdb
Change-Id: I14d23175a455c21df8d526bfa2ae034e80e199d5
Andrew Sapperstein [Sat, 11 Jun 2016 19:12:44 +0000 (12:12 -0700)]
Update Settings to use DeviceDefault.Settings.
BUG:
28625050
Change-Id: Id283703a309cf27bb284147421614196e903c660
Dan Sandler [Tue, 21 Jun 2016 18:18:21 +0000 (18:18 +0000)]
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am:
87fcf9e95f
Change-Id: I94d18998914552d21099b12b22471ea93857cf52
Dan Sandler [Tue, 21 Jun 2016 18:17:08 +0000 (18:17 +0000)]
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am:
87fcf9e95f
Change-Id: I40778ba470d12dd6f5b924ddcf650f27459faab6
Daniel Sandler [Tue, 21 Jun 2016 18:11:11 +0000 (18:11 +0000)]
Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev
Pavel Zhamaitsiak [Tue, 21 Jun 2016 18:09:07 +0000 (18:09 +0000)]
Merge \"Hide WFC settings if WFC is not provisioned (and provisioning is required)\" into nyc-mr1-dev
am:
4f3a7589bc
Change-Id: Id9a51ea55922879c2776964d7a0d3c7a3ad8877b
Jason Monk [Tue, 21 Jun 2016 18:04:39 +0000 (14:04 -0400)]
Fix tethering re-enable after edit.
Sometimes the tether state change comes in late (or seemingly not
at all). Also listen for wifi ap state changes as a fallback for
this case.
Change-Id: I6677c4277453be881967a3cf2234de11cd0237b8
Fixes:
28851179
TreeHugger Robot [Tue, 21 Jun 2016 17:58:25 +0000 (17:58 +0000)]
Merge "Hide WFC settings if WFC is not provisioned (and provisioning is required)" into nyc-mr1-dev
Jason Monk [Tue, 21 Jun 2016 17:36:57 +0000 (13:36 -0400)]
Update battery content descriptions with labels
Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes:
28301362
Fan Zhang [Tue, 21 Jun 2016 17:27:31 +0000 (17:27 +0000)]
Merge \"Enable/disable support buttons based on operation hours.\" into nyc-mr1-dev
am:
a00e3b78de
Change-Id: I62abaad50d57747197450dd09c7fb224a1a10ec1
Fan Zhang [Tue, 21 Jun 2016 17:21:07 +0000 (17:21 +0000)]
Merge "Enable/disable support buttons based on operation hours." into nyc-mr1-dev
Bill Yi [Tue, 21 Jun 2016 17:02:49 +0000 (17:02 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
f315e2e6f0 -s ours
am:
440199c6c4 -s ours
Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef
Bill Yi [Tue, 21 Jun 2016 16:58:10 +0000 (16:58 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
f315e2e6f0 -s ours
am:
672e1ddb14 -s ours
Change-Id: Ia75f957c8348a0562d7941220b8a796fe57d363d
Bill Yi [Tue, 21 Jun 2016 16:58:09 +0000 (16:58 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
5903be35f4 -s ours
Change-Id: I12bdb0e46f4401413a38b8b699e464929e88f504
Bill Yi [Tue, 21 Jun 2016 16:56:45 +0000 (16:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f315e2e6f0 -s ours
Change-Id: I2b7c6b292d8197f588fca6dc8c05a329e58d6733
Bill Yi [Tue, 21 Jun 2016 16:56:44 +0000 (16:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f315e2e6f0 -s ours
Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc
TreeHugger Robot [Tue, 21 Jun 2016 16:53:39 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:53:25 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Sunny Goyal [Tue, 21 Jun 2016 16:48:12 +0000 (16:48 +0000)]
Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
am:
139fbb78b5
Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a
Sunny Goyal [Tue, 21 Jun 2016 16:39:33 +0000 (16:39 +0000)]
Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 16:00:35 +0000 (16:00 +0000)]
Fix non-app non-user preferences in Settings > Data usage am:
afea1cae25
am:
e341462a50
Change-Id: Idc9d5d2381b7c33cedc6b3d1e8bac1776b3ab1e9
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:57:08 +0000 (15:57 +0000)]
Fix non-app non-user preferences in Settings > Data usage
am:
afea1cae25
Change-Id: I55e991f5cd9c39a740dd62945fe113ee59ea18a9
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:55:07 +0000 (15:55 +0000)]
Fix non-app non-user preferences in Settings > Data usage am:
afea1cae25
am:
63170fbf7a
Change-Id: Iabfb95c0b071b8ebe2ab8a659d323a9cda2656d5
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:52:33 +0000 (15:52 +0000)]
Fix non-app non-user preferences in Settings > Data usage
am:
afea1cae25
Change-Id: I09905ec152a16e12436927bd514fb6cbe5afb59a
Fan Zhang [Tue, 21 Jun 2016 15:35:07 +0000 (15:35 +0000)]
Merge \"Log button taps in support tab.\" into nyc-mr1-dev
am:
a2fe136837
Change-Id: I661ffe3744f44e69e886e8f5a825304f2c022d4b
Fan Zhang [Tue, 21 Jun 2016 15:28:29 +0000 (15:28 +0000)]
Merge "Log button taps in support tab." into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 11:57:30 +0000 (12:57 +0100)]
Fix non-app non-user preferences in Settings > Data usage
Bug:
29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
Bill Yi [Tue, 21 Jun 2016 11:40:02 +0000 (04:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia258f44583c5690bd396d20517e1309807c659ad
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 11:28:46 +0000 (04:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfc06a928c222879aceec01c3aaf35f2cf78561
Auto-generated-cl: translation import
Dan Sandler [Tue, 21 Jun 2016 03:53:34 +0000 (23:53 -0400)]
Show "0" instead of "0 B" in storage settings.
Two benefits:
- "0 B" might be a little confusing for sighted users
- "zero bee" is definitely confusing for TalkBack users
Nonzero storage items will still read as "640 KB" which
should be enough for anyone.
Change-Id: I5c89f7c6382ca14fb91d7d1dd145977f855618ae
Fixes:
27973778
Pavel Zhamaitsiak [Tue, 21 Jun 2016 00:52:48 +0000 (17:52 -0700)]
Hide WFC settings if WFC is not provisioned (and provisioning is required)
Bug:
29223318
Change-Id: Ic927e742d84f55ea411a0d034fc1caac72ee58e7
Sunny Goyal [Wed, 15 Jun 2016 19:36:50 +0000 (12:36 -0700)]
Adding custom manifest shortcuts in Settings app
Bug:
28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
Julia Reynolds [Mon, 20 Jun 2016 19:18:31 +0000 (19:18 +0000)]
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am:
43b04bcc7d
am:
07e85aa5c0
Change-Id: I409fd02854876c68e004cdb62500fdbaffd4085d
Julia Reynolds [Mon, 20 Jun 2016 19:12:14 +0000 (19:12 +0000)]
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am:
43b04bcc7d
am:
018444ab61
Change-Id: I1946b95fd5ccf8e4506b452998c478c2781d3e3a
Julia Reynolds [Mon, 20 Jun 2016 19:08:43 +0000 (19:08 +0000)]
Merge \"Fix NPE printing notification actions.\" into nyc-dev
am:
43b04bcc7d
Change-Id: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
Julia Reynolds [Mon, 20 Jun 2016 18:58:07 +0000 (18:58 +0000)]
Merge \"Fix NPE printing notification actions.\" into nyc-dev
am:
43b04bcc7d
Change-Id: I2763437122129654485c80b7652729526042321a
Julia Reynolds [Mon, 20 Jun 2016 18:43:04 +0000 (18:43 +0000)]
Merge "Fix NPE printing notification actions." into nyc-dev
Fan Zhang [Thu, 16 Jun 2016 20:40:20 +0000 (13:40 -0700)]
Enable/disable support buttons based on operation hours.
Also update support title based on whether support operation is
available.
Bug:
28827790
Change-Id: I65eb70d18ba16ccc263bce019fcbbe5e10ffa596
Jason Monk [Mon, 20 Jun 2016 17:50:40 +0000 (17:50 +0000)]
Fix focusability of battery history chart am:
9c6ab88bd7
am:
5c3f9459e8
Change-Id: If0977bcf4fe63d0b14cb5e811ae37fab40f74446
Jason Monk [Mon, 20 Jun 2016 17:38:19 +0000 (17:38 +0000)]
Fix focusability of battery history chart am:
9c6ab88bd7
am:
b363eb89bc
Change-Id: Ibdb83d13677d9101264593e2220b9d18fc261fc9
Jason Monk [Mon, 20 Jun 2016 17:29:24 +0000 (17:29 +0000)]
Fix focusability of battery history chart
am:
9c6ab88bd7
Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c
Jason Monk [Mon, 20 Jun 2016 17:26:42 +0000 (17:26 +0000)]
Fix focusability of battery history chart
am:
9c6ab88bd7
Change-Id: I11bace8b2417900056b4220e65c4e394adceb669
Fan Zhang [Fri, 17 Jun 2016 00:28:27 +0000 (17:28 -0700)]
Log button taps in support tab.
Bug:
29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
Fan Zhang [Mon, 20 Jun 2016 17:25:45 +0000 (17:25 +0000)]
Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
am:
d04b49649e
Change-Id: I25ff49cb0ce6ab6cb4cfb35aef254d3881e343e1
Fan Zhang [Mon, 20 Jun 2016 16:35:51 +0000 (16:35 +0000)]
Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
Jason Monk [Mon, 20 Jun 2016 15:04:43 +0000 (11:04 -0400)]
Fix focusability of battery history chart
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes:
29453492
Julia Reynolds [Mon, 20 Jun 2016 14:23:44 +0000 (10:23 -0400)]
Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes:
29017025
Meng Wang [Sat, 18 Jun 2016 04:12:40 +0000 (04:12 +0000)]
Merge \"Hide \'Update Emergecy Address\' preference w/o carrier support\" into nyc-mr1-dev
am:
2a817d97fe
Change-Id: Iccf8008b7a818bf8327e8e53632326dd0dc41982
TreeHugger Robot [Sat, 18 Jun 2016 04:02:49 +0000 (04:02 +0000)]
Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
Doris Ling [Fri, 17 Jun 2016 18:22:59 +0000 (11:22 -0700)]
Add play icon to the gesture settings videos.
1. Add a play button icon to show on top of the gesture videos when the
video is not playing.
2. Dynamically split the gesture video and description text in half
instead of using the hard coded value.
3. Hide the video view if animation is not available.
4. Delay removing the animation preview till the video starts drawing on
the surface texture.
Bug:
28565958
Change-Id: I8b954828d16286014404172d29efa4d2e00432b3
Fan Zhang [Fri, 17 Jun 2016 20:20:54 +0000 (20:20 +0000)]
Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
am:
b2728f51fb
Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea
Fan Zhang [Fri, 17 Jun 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev
Fan Zhang [Fri, 17 Jun 2016 18:20:52 +0000 (11:20 -0700)]
Add a "Do not show" checkbox in support disclaimer dialog.
Bug:
28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
Doris Ling [Fri, 17 Jun 2016 18:20:38 +0000 (18:20 +0000)]
Merge \"Add handling for fingerprint swipe in gesture settings.\" into nyc-mr1-dev
am:
b458f46438
Change-Id: I3ad94884053f7d3788c06ef7d75b4f40f7b46758
Doris Ling [Fri, 17 Jun 2016 18:15:57 +0000 (18:15 +0000)]
Merge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev
Jason Monk [Fri, 17 Jun 2016 17:55:04 +0000 (17:55 +0000)]
Merge \\"Protect against crash in memory details\\" into nyc-dev am:
c3ec1ab889
am:
ca26435ca0
Change-Id: Ib5c782a3044161923c91aa8b5fb1fa31dedc9b09
Jason Monk [Fri, 17 Jun 2016 17:55:03 +0000 (17:55 +0000)]
Make sure screen pinning desc is part of view hierarchy am:
0c2ccba2f9
am:
2ca05240fd
Change-Id: I8b2fb6adf8959d0504b17f8ad2a3c3f33a797da3
Jason Monk [Fri, 17 Jun 2016 17:52:01 +0000 (17:52 +0000)]
Merge \"Protect against crash in memory details\" into nyc-dev
am:
c3ec1ab889
Change-Id: If36b3350e0694ffae3086be9307295c4516828dd
Jason Monk [Fri, 17 Jun 2016 17:52:01 +0000 (17:52 +0000)]
Make sure screen pinning desc is part of view hierarchy
am:
0c2ccba2f9
Change-Id: Iac6d8d4df22fb8e32e61ad25aed06e079d1fa348
Jason Monk [Fri, 17 Jun 2016 17:47:25 +0000 (17:47 +0000)]
Merge \\"Protect against crash in memory details\\" into nyc-dev am:
c3ec1ab889
am:
989a52dc8d
Change-Id: I09960da265e426c58fc651d3c9b932f20633f1fb
Jason Monk [Fri, 17 Jun 2016 17:47:25 +0000 (17:47 +0000)]
Make sure screen pinning desc is part of view hierarchy am:
0c2ccba2f9
am:
11bad8d93e
Change-Id: I1235d2ae35600c71f92d69f1f4475a3b70efeef1
Jason Monk [Fri, 17 Jun 2016 17:44:25 +0000 (17:44 +0000)]
Merge \"Protect against crash in memory details\" into nyc-dev
am:
c3ec1ab889
Change-Id: I64ec49c820c21971056b342908a1e0c33d394d72
Jason Monk [Fri, 17 Jun 2016 17:44:25 +0000 (17:44 +0000)]
Make sure screen pinning desc is part of view hierarchy
am:
0c2ccba2f9
Change-Id: I20e98baa0be229a72673ef18eccd35bc713f75ad
Jason Monk [Fri, 17 Jun 2016 17:22:03 +0000 (17:22 +0000)]
Merge "Protect against crash in memory details" into nyc-dev
Adrian Roos [Fri, 17 Jun 2016 17:10:17 +0000 (17:10 +0000)]
resolve merge conflicts of
333ba2d to nyc-mr1-dev
am:
bd470255d0
Change-Id: I8013125ea8560c8d0b0cd972536316a394859cca
Jason Monk [Fri, 17 Jun 2016 14:12:37 +0000 (10:12 -0400)]
Protect against crash in memory details
Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes:
29308942
Jason Monk [Fri, 17 Jun 2016 14:05:06 +0000 (10:05 -0400)]
Make sure screen pinning desc is part of view hierarchy
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes:
29243233
Bill Yi [Fri, 17 Jun 2016 06:59:43 +0000 (06:59 +0000)]
Import translations. DO NOT MERGE am:
5820d03643 -s ours
am:
86f3cf9bc9 -s ours
Change-Id: If4bd213c1a985740be4c1fb1fc5b8fd03ca2359f
Bill Yi [Fri, 17 Jun 2016 04:57:59 +0000 (04:57 +0000)]
Import translations. DO NOT MERGE
am:
5820d03643 -s ours
Change-Id: I112e5d37b0e2bea442ddeb9431864ab06c983f6b
Adrian Roos [Fri, 17 Jun 2016 01:58:04 +0000 (18:58 -0700)]
resolve merge conflicts of
380b01a to nyc-mr1-dev-plus-aosp
Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a
Adrian Roos [Fri, 17 Jun 2016 01:54:50 +0000 (18:54 -0700)]
resolve merge conflicts of
333ba2d to nyc-mr1-dev
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
Ajay Nadathur [Fri, 17 Jun 2016 01:45:44 +0000 (01:45 +0000)]
Merge \"[SetupWizard] Fix talkback on lock screen.\" into nyc-mr1-dev
am:
eddcd7d085
Change-Id: I8b4780b65a3088b3b7937d9c88326ace67a9e90d
Maurice Lam [Fri, 17 Jun 2016 01:45:44 +0000 (01:45 +0000)]
Center pattern lock screen vertically
am:
0707fdc2e0
Change-Id: I28031ebfff2c09171ff948636e2961422ea70898
Ajay Kumar Nadathur Sreenivasan [Fri, 17 Jun 2016 01:18:00 +0000 (01:18 +0000)]
Merge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev
Meng Wang [Thu, 16 Jun 2016 01:17:06 +0000 (18:17 -0700)]
Hide 'Update Emergecy Address' preference w/o carrier support
Bug:
29256401
Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7
Adrian Roos [Thu, 16 Jun 2016 23:41:25 +0000 (23:41 +0000)]
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am:
333ba2df01
Change-Id: Ib9419acf4b09dd17fd15b53d32ce4616cbec94fa
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
Fan Zhang [Fri, 6 May 2016 17:52:26 +0000 (10:52 -0700)]
Use metrics defined by proto in new Settings tabs.
Bug:
28141203
Change-Id: Ia0c566f873f93e46203d19f35161bb98acc60a38
OSDN Git Service
