Commit Graph

27607 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Jason Monk
08358a899a Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b
am: 75a09c1db9

* commit '75a09c1db9e9a441d4678171b921431fc629ee94':
  Fix label loading on default home setting

Change-Id: I923fbaa7095ed4c5fcda4f8e9f56e508af7b976c
2016-05-10 17:40:57 +00:00
Baligh Uddin
37bd336595 Import translations. DO NOT MERGE
Change-Id: I433f23d9ad9b6831b6a94c5f13dde7fa9e521c3b
Auto-generated-cl: translation import
2016-05-10 10:39:45 -07:00
Jason Monk
75a09c1db9 Merge "Fix label loading on default home setting" into nyc-dev
am: cbf2ccbe1b

* commit 'cbf2ccbe1b60fc5958faf7be4f01b775ad2a1d9a':
  Fix label loading on default home setting

Change-Id: Idaa6dcdf870bf19bcee6b9696b62dbafeeb3465a
2016-05-10 17:38:24 +00:00
Jason Monk
a69387df1d Merge "Fix label loading on default home setting" into nyc-dev
am: cbf2ccbe1b

* commit 'cbf2ccbe1b60fc5958faf7be4f01b775ad2a1d9a':
  Fix label loading on default home setting

Change-Id: I086223f35c7eadd2e1eea61067d1bfd194512aad
2016-05-10 17:38:22 +00:00
Jason Monk
cbf2ccbe1b Merge "Fix label loading on default home setting" into nyc-dev 2016-05-10 17:34:09 +00:00
Baligh Uddin
41f959d2c1 Import translations. DO NOT MERGE
Change-Id: I0d63c7faea233cf237002dddebb4fb96a3ecae18
Auto-generated-cl: translation import
2016-05-10 10:31:18 -07:00
Hyunyoung Song
0e9f297027 Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev
am: 6f2771623f

* commit '6f2771623f3a93d51ad075c476ca9b538c0d44e6':
  Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771.

Change-Id: I04623fcec7e8046c7a5e905e09261d5c9e550018
2016-05-10 17:30:20 +00:00
Hyunyoung Song
6f2771623f Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev 2016-05-10 17:21:48 +00:00
Hyunyoung Song
1e51aa507d Revert "Add shortcut manager support to Settings (2/2) b/28298258"
b/28643184
This reverts commit 79ec6df771.

Change-Id: I3de8a27e88a5a84825e914725259530b22756da0
2016-05-10 17:16:33 +00:00
Jason Monk
a41a8d05ab Make sure TileAdapter always has a SuggestionParser
Since it expects to have one

Change-Id: Ic0dccd2271c011cf7dc877e341af5a8bfea90c37
Fixes: 28689801
2016-05-10 13:03:35 -04:00
Jason Monk
96be611e16 Fix label loading on default home setting
Change-Id: Ia7d00eaf48eb703b766c760b6140ea98be5490f1
Fixes: 28668320
2016-05-10 12:47:37 -04:00
Android Build Merger (Role)
254e0b3b3f Merge "Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe am: 5296dbca73" into nyc-mr1-dev-plus-aosp 2016-05-10 14:43:02 +00:00
Victor Chang
94c75422da Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe
am: 5296dbca73

* commit '5296dbca738761167ea67dc42db5301a7ec686f8':
  Show a different Root CA string for device owner

Change-Id: I81dea6096db6ebd7b85df9a19c2cc375c339e3e7
2016-05-10 14:42:49 +00:00
Victor Chang
f906f3c24a Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe
am: 5ffcedbae9

* commit '5ffcedbae97338a8d549592d8149cee98cea61f0':
  Show a different Root CA string for device owner

Change-Id: I2b939b8fbbff30b3fef67a334d06c5ee19e901ea
2016-05-10 14:42:47 +00:00
Victor Chang
5296dbca73 Merge "Show a different Root CA string for device owner" into nyc-dev
am: 9c31684bbe

* commit '9c31684bbe449e320e5174a2fcee4ab1900e182c':
  Show a different Root CA string for device owner

Change-Id: I1d22ab807c576483ffc29cc459e7c321a38fb1a1
2016-05-10 14:35:53 +00:00
Victor Chang
5ffcedbae9 Merge "Show a different Root CA string for device owner" into nyc-dev
am: 9c31684bbe

* commit '9c31684bbe449e320e5174a2fcee4ab1900e182c':
  Show a different Root CA string for device owner

Change-Id: I85745e298c2e141f55446c8f0460f4745b1b8767
2016-05-10 14:35:53 +00:00
Victor Chang
9c31684bbe Merge "Show a different Root CA string for device owner" into nyc-dev 2016-05-10 14:29:39 +00:00
Felipe Leme
00696bbe40 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am: 8c3b5fa3cf
am: 2318d40fc3

* commit '2318d40fc32643a431502b5b9633674c16f363ac':

Change-Id: I066be3582b1c22ca3c84e6350e0e1fd4eeb2878e
2016-05-09 20:14:04 +00:00