Jason Monk
e1b9ad424c
Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41
am: b88e4899ff
...
am: 93fc24535b
* commit '93fc24535b7dc1ecd6e1200d148afed4f70d0b00':
Fix crash on rotate pointer speed
Change-Id: Ib53059eed143a57eec48c82ce08b5050167e3578
2016-05-11 13:54:20 +00:00
Jason Monk
f019d2df6b
Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41
...
am: 7cdfe9a6d8
* commit '7cdfe9a6d8c8cbdced15bb1001ef0912424ad27c':
Change-Id: Ibb845db7176f6a46205f24d9734bce599b8675d2
2016-05-11 13:52:15 +00:00
Jason Monk
93fc24535b
Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41
...
am: b88e4899ff
* commit 'b88e4899ffd6daa9d27cb42ddeae6afa3cfad111':
Fix crash on rotate pointer speed
Change-Id: I2431d97095b0a5011a2de512d9fdba04836bf1b3
2016-05-11 13:49:45 +00:00
Jason Monk
b88e4899ff
Merge "Fix crash on rotate pointer speed" into nyc-dev
...
am: ab30931d41
* commit 'ab30931d4156afb8ee56c8df3b48fad4703712a7':
Fix crash on rotate pointer speed
Change-Id: Id1745575e2210352ef4f4799e8a787f69ebe9b70
2016-05-11 13:46:45 +00:00
Jason Monk
7cdfe9a6d8
Merge "Fix crash on rotate pointer speed" into nyc-dev
...
am: ab30931d41
* commit 'ab30931d4156afb8ee56c8df3b48fad4703712a7':
Fix crash on rotate pointer speed
Change-Id: I6c73b33e8da5260240c7b6a549151da95c926164
2016-05-11 13:46:42 +00:00
Jason Monk
ab30931d41
Merge "Fix crash on rotate pointer speed" into nyc-dev
2016-05-11 13:36:53 +00:00
Felipe Leme
c3534bb963
Removed onRestrictPowerChanged().
...
BUG: 28521946
Change-Id: Ib48030c704cf38541101b600b1e91935302beb9c
2016-05-10 23:21:29 +00:00
Andrew Sapperstein
ac384f47c5
Merge "Add list item to open tips & tricks." into nyc-mr1-dev am: 277b7a81bd
...
am: ebe454e32a
* commit 'ebe454e32af92ec37bf9dd6413378443e2645f5e':
Add list item to open tips & tricks.
Change-Id: Ia7dac06f485b5ce5191e3952737824c96f8d1989
2016-05-10 22:06:15 +00:00
Jason Monk
2d501ebc4b
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a
am: 6e9867dcc9
...
am: ce00f641e6
* commit 'ce00f641e6371b41614f171ddaeceffe5b81f825':
Change-Id: Id05d1d52f82fe1cc4d10bccc742a4ce97eb5015e
2016-05-10 22:06:14 +00:00
Sudheer Shanka
b40c51c950
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144
am: a9cadaa52a
...
am: 062bf2708b
* commit '062bf2708b15b70ae08f3313f554a8b89eb62ece':
Change-Id: I369f61e24ecad5ce19ab57bd35a78c7be4742d56
2016-05-10 22:06:13 +00:00
Andrew Sapperstein
ebe454e32a
Merge "Add list item to open tips & tricks." into nyc-mr1-dev
...
am: 277b7a81bd
* commit '277b7a81bdf4e5c9147dbb430f875c7f80e4e0e1':
Add list item to open tips & tricks.
Change-Id: I765b9f356c24c654ff08192ef3ed0bc582b24a59
2016-05-10 20:44:56 +00:00
Jason Monk
2e2f19d2eb
resolve merge conflicts of 0496ffa
to master
...
Change-Id: I61589b7e9f1190e19d48dbb421541ebc2891ee82
2016-05-10 16:34:48 -04:00
Jason Monk
ce00f641e6
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a
...
am: 6e9867dcc9
* commit '6e9867dcc9766d3f14627b34ee4b74531062681a':
Change-Id: Ifa40dcf509d5a70d2058d0255dfc21a8945cffe5
2016-05-10 20:31:51 +00:00
Sudheer Shanka
062bf2708b
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144
...
am: a9cadaa52a
* commit 'a9cadaa52ad53ec130c4a635f0d18f79e01618a4':
Change-Id: I236318d8c9f854a9d4d79dfb21f21b625635a99a
2016-05-10 20:31:50 +00:00
Sudheer Shanka
fec0c1b1c7
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144
am: e869494be1
...
am: a4b264132a
* commit 'a4b264132aec094ceabce54f8ccd02024120da0d':
Update the visibility state of views in UserPreference properly.
Change-Id: I38757b48bf8efef27a34e4c0b338bf6ae5abbcf0
2016-05-10 20:31:34 +00:00
TreeHugger Robot
277b7a81bd
Merge "Add list item to open tips & tricks." into nyc-mr1-dev
2016-05-10 20:31:09 +00:00
Jason Monk
0496ffad87
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a
...
am: 4101ba4eb1
* commit '4101ba4eb1395988941f3f24bc2f502753036e2f':
Make sure TileAdapter always has a SuggestionParser
Change-Id: Ic204cabd5cdbdd67f6bbdb53032a277da7fd34fa
2016-05-10 20:29:02 +00:00
Sudheer Shanka
a4b264132a
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144
...
am: e869494be1
* commit 'e869494be1183e08ccc2d99e3ce79a226147de6b':
Update the visibility state of views in UserPreference properly.
Change-Id: I4dd252b002a96c9ae7b91e3ee5aba0c9ad7b57b7
2016-05-10 20:29:02 +00:00
Jason Monk
4101ba4eb1
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev
...
am: a50a14a23a
* commit 'a50a14a23a4f57203d01489ddef607f46f485518':
Make sure TileAdapter always has a SuggestionParser
Change-Id: I484e3d7ec30276538ec2a9176eb529f9e2d839b0
2016-05-10 20:26:28 +00:00
Sudheer Shanka
e869494be1
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev
...
am: a3b2bdc144
* commit 'a3b2bdc1442c807bfd0bb733221b04dd6eedf1fe':
Update the visibility state of views in UserPreference properly.
Change-Id: I9ddab9b11526da4f0d4c7912b7ba4992b2e1306b
2016-05-10 20:26:27 +00:00
Jason Monk
6e9867dcc9
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev
...
am: a50a14a23a
* commit 'a50a14a23a4f57203d01489ddef607f46f485518':
Make sure TileAdapter always has a SuggestionParser
Change-Id: I87ee80fa989079c554c60870b9ddc70d3b36c5e4
2016-05-10 20:26:22 +00:00
Sudheer Shanka
a9cadaa52a
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev
...
am: a3b2bdc144
* commit 'a3b2bdc1442c807bfd0bb733221b04dd6eedf1fe':
Update the visibility state of views in UserPreference properly.
Change-Id: I911765978cd757441ba8f6c2e9c83a61b2754ca4
2016-05-10 20:26:22 +00:00
Jason Monk
a50a14a23a
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev
2016-05-10 20:23:16 +00:00
Sudheer Shanka
a3b2bdc144
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev
2016-05-10 20:14:25 +00:00
Jason Monk
8c44f06443
Fix crash on rotate pointer speed
...
Change-Id: Ie87b0343f153957d7c7129a04690af20361f9063
Fixes: 28641237
2016-05-10 15:41:30 -04:00
Andrew Sapperstein
49db9c38b5
Add list item to open tips & tricks.
...
Added to the more help list for now.
BUG: 28654701
Change-Id: Ia020c3ffb5ab42cb82ffa75834fa45d20f2a1e72
2016-05-10 12:08:47 -07:00
Maurice Lam
0ceb2d69d5
Fix truncated text in pattern lock setup
...
Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.
Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.
Bug: 28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916
2016-05-10 11:38:03 -07:00
Baligh Uddin
105f6d919a
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de
-s ours am: 172b04e468
-s ours" into nyc-mr1-dev-plus-aosp
...
am: 9b1a3d9960
-s ours
* commit '9b1a3d996039032a456bb4b0bd3c8d98f4df59f4':
Change-Id: Ie80139f50bac582667406a79ec054481c2d6edf0
2016-05-10 18:27:22 +00:00
Baligh Uddin
e23d238cce
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1
-s ours" into nyc-mr1-dev-plus-aosp
...
am: 3fc386f676
-s ours
* commit '3fc386f6765d09fdcbb61f7f487c75ea560754d2':
Change-Id: I4f24d984b192cf857b2ae3b90fada8cab0ee14f8
2016-05-10 18:27:21 +00:00
Baligh Uddin
69d6fd5f0f
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1
-s ours" into nyc-mr1-dev-plus-aosp
...
am: ce437f6f71
-s ours
* commit 'ce437f6f718c872bc299217ab3e77d6d0c622188':
Import translations. DO NOT MERGE
Change-Id: I0c7c45300f6f2ca1ce93ffe016c6a95d56fc51ca
2016-05-10 18:27:19 +00:00
Baligh Uddin
dcf61bc38d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de
-s ours am: 994fbea737
-s ours
...
am: 289801bf42
-s ours
* commit '289801bf42f753d783dc1c143e3d03f611e5cad9':
Import translations. DO NOT MERGE
Change-Id: Ia3f8ccef2a33bdaa61c3d1551839849bca46ecc7
2016-05-10 18:27:17 +00:00
Android Build Merger (Role)
9b1a3d9960
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de
-s ours am: 172b04e468
-s ours" into nyc-mr1-dev-plus-aosp
2016-05-10 18:19:02 +00:00
Android Build Merger (Role)
3fc386f676
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1
-s ours" into nyc-mr1-dev-plus-aosp
2016-05-10 18:18:54 +00:00
Baligh Uddin
c4cfab5239
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de
-s ours
...
am: 172b04e468
-s ours
* commit '172b04e468583fc7c29970b1ca6aa90f69c1e713':
Change-Id: I480d61a4ba7c9033b31cc4dd1daa11e483812928
2016-05-10 18:18:37 +00:00
Baligh Uddin
6f3299f22e
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 94f982c1d1
-s ours
* commit '94f982c1d13de9185cc80e62ce15b52e1f9ed6c2':
Import translations. DO NOT MERGE
Change-Id: I3043a31e7be0ef5dc2d66633c563028fb18c2cdf
2016-05-10 18:18:36 +00:00
Daniel Nishi
769774a4dd
resolve merge conflicts of b59dbf6
to master
...
Change-Id: I6ef5cd4bae9ff67a5b5367b291a14731e5b871eb
2016-05-10 11:17:28 -07:00
Android Build Merger (Role)
ce437f6f71
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1
-s ours" into nyc-mr1-dev-plus-aosp
2016-05-10 18:16:17 +00:00
Baligh Uddin
1d3b7a05bf
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 94f982c1d1
-s ours
* commit '94f982c1d13de9185cc80e62ce15b52e1f9ed6c2':
Import translations. DO NOT MERGE
Change-Id: Iefddd701fc442d989d7c55e5db590d0194cb14e3
2016-05-10 18:15:58 +00:00
Baligh Uddin
289801bf42
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de
-s ours
...
am: 994fbea737
-s ours
* commit '994fbea737718ccc47b83467a1e75027ff327228':
Import translations. DO NOT MERGE
Change-Id: Iab066dbe7473df8047edec1eac2440483cbf4035
2016-05-10 18:15:52 +00:00
Baligh Uddin
172b04e468
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 7efa4cc6de
-s ours
* commit '7efa4cc6deedd3e5a3443b294698be1c007e25e1':
Import translations. DO NOT MERGE
Change-Id: Ie703cc9ee56a69091d7f570f0a9f07101469f330
2016-05-10 18:13:00 +00:00
Baligh Uddin
994fbea737
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 7efa4cc6de
-s ours
* commit '7efa4cc6deedd3e5a3443b294698be1c007e25e1':
Import translations. DO NOT MERGE
Change-Id: Iaf9d94c6a18930c8080da0d30cee8a093052f667
2016-05-10 18:13:00 +00:00
Baligh Uddin
09a63a42f0
Merge "Import translations. DO NOT MERGE"
2016-05-10 18:05:45 +00:00
Baligh Uddin
7efa4cc6de
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-10 18:05:44 +00:00
Baligh Uddin
94f982c1d1
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-10 18:05:40 +00:00
Daniel Nishi
b59dbf632f
Merge "Create an overlay to add a photo and video deletion helper service." into nyc-mr1-dev
...
am: 7961077e3a
* commit '7961077e3acdbb7dc0648b5ce7314adb504de0bf':
Create an overlay to add a photo and video deletion helper service.
Change-Id: Ied44ae1ae3c26ebf010a95afe8897e04e25b28e3
2016-05-10 17:57:50 +00:00
Daniel Nishi
7961077e3a
Merge "Create an overlay to add a photo and video deletion helper service." into nyc-mr1-dev
2016-05-10 17:50:21 +00:00
Daniel Nishi
38889de699
Create an overlay to add a photo and video deletion helper service.
...
This overlay defines a checkbox preference in the deletion helper for
facilitating the deletion of photos and videos. The service which
provides deletion clearing can be overridden and used to create a
custom photo and video deletion helper.
Bug: 28554187
Bug: 28560856
Change-Id: Id5d9671a307aaac0d1331f055b8f2ab7aa67977c
2016-05-10 10:48:59 -07:00
Jason Monk
fe0865bd47
Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b
am: a69387df1d
...
am: ced0768d49
* commit 'ced0768d490ac5e6ee0b24f99a33b453ee2e78c6':
Change-Id: I2ce88a96f4e8ff0b7afe74294905c4b1a93ab053
2016-05-10 17:46:51 +00:00
Jason Monk
77a19385e3
Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b
am: 75a09c1db9
...
am: 08358a899a
* commit '08358a899abc4cd7b40ce81ba68e63d7797b9f23':
Fix label loading on default home setting
Change-Id: I8ca957720f11b9fd099681daf118634a6d9c9838
2016-05-10 17:44:10 +00:00
Jason Monk
ced0768d49
Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b
...
am: a69387df1d
* commit 'a69387df1d594823becfa129a72960264c487c31':
Change-Id: I28a37469abea63baf11909d048921a058eb8f333
2016-05-10 17:44:00 +00:00