Sudheer Shanka
f114a556fe
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d
...
am: 7cc2fa51d1
* commit '7cc2fa51d1dc40a85f88a86c748c039b81a6af46':
Fix crash in SetupRedactionInterstitial.
Change-Id: I6b924c3a07fb51b29e39fb18c7af5e3038f472fd
2016-05-16 20:24:58 +00:00
Sudheer Shanka
7cc2fa51d1
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
...
am: 31fb2a7a1d
* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
Fix crash in SetupRedactionInterstitial.
Change-Id: I526e7fe3e9c11bb36babc386c1cbbcb0187e6bbd
2016-05-16 20:22:31 +00:00
Sudheer Shanka
5581312428
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
...
am: 31fb2a7a1d
* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
Fix crash in SetupRedactionInterstitial.
Change-Id: I55d25ec0d3fc06ba099aec098220500ed7c8d61f
2016-05-16 20:22:30 +00:00
Sudheer Shanka
dc3ed0a5bf
Fix crash in SetupRedactionInterstitial.
...
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes: 28785168
2016-05-16 11:46:34 -07:00
Daniel Nishi
de98b25c01
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
...
am: 95c3c5045f
* commit '95c3c5045fde4667e8085d69a0aba4b82126d682':
Add downloads to the deletion helper.
Change-Id: I192143eb333d584b4ec792913eda79d9614c6150
2016-05-14 00:12:32 +00:00
Daniel Nishi
2ef20fb36d
Add downloads to the deletion helper.
...
This adds a deletion service to delete files in the Downloads
folder. All of the files there are collected and offered to the
user to delete.
Bug: 28621781
Change-Id: I94431f9abc3a0afa2d07dbab763312c09e830aef
2016-05-13 13:35:37 -07:00
Makoto Onuki
dc3bb2798a
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
...
am: f4ffd6daff
* commit 'f4ffd6daff1a626d196e30cdebcbf913f936714e':
ShortcutManager: Remove developer option from NYC
Change-Id: I7689577ee57a58d1abdb4690c453f6a9cadfa251
2016-05-13 18:59:31 +00:00
Makoto Onuki
446e5a536e
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
...
am: a23cd4614f
* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
ShortcutManager: Remove developer option from NYC
Change-Id: Icd507fcaba578122e50f4fc86e53bd65b4cac1fb
2016-05-13 18:57:00 +00:00
Makoto Onuki
f4ffd6daff
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
...
am: a23cd4614f
* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
ShortcutManager: Remove developer option from NYC
Change-Id: Ie49323be5bb7f8b5e258ecb40382463e3cbb847b
2016-05-13 18:57:00 +00:00
Makoto Onuki
a23cd4614f
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
2016-05-13 18:51:41 +00:00
Makoto Onuki
d819814c63
ShortcutManager: Remove developer option from NYC
...
Bug 28704708
Change-Id: Ib2301ea556104e9ffd6a18885e228717843d6acb
2016-05-13 09:40:26 -07:00
Maurice Lam
5e292d249c
Set fingerprint accent/primary color
...
Bug: 28728613
Change-Id: Id3b2d0b6ca7cbff1dd695a7a6cd5d93988d29077
2016-05-12 18:06:14 -07:00
Adrian Roos
3b7eedabb8
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a
...
am: 1d1ca8e590
* commit '1d1ca8e5905c100efde0ffdfcc8b1dcc7dbc32c8':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I2e2310c09f240beb92146d8d24c4bc6fdc413364
2016-05-12 21:02:28 +00:00
Adrian Roos
e7c67aae22
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
...
am: ef505d628a
* commit 'ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: Ieaa1f148c3db5fc41e1bb51faf987eac1b896bd4
2016-05-12 21:00:03 +00:00
Adrian Roos
1d1ca8e590
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
...
am: ef505d628a
* commit 'ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I5746a924564e8eb866b0c0e0a1e0205a38896f89
2016-05-12 20:59:47 +00:00
Adrian Roos
ef505d628a
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
2016-05-12 20:52:25 +00:00
Adrian Roos
059b0fa060
Allow DPMs to restrict Remote Input on Keyguard
...
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes: 26981262
2016-05-12 19:12:17 +00:00
Fan Zhang
1fb38d03bf
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
...
am: f5746f9078
* commit 'f5746f90781c40380f8ec3057abcf9c67d830882':
Update suggestion/support UI to use more negative space.
Change-Id: Ie1f58f267b284735b7f2c86741a516d385f07530
2016-05-12 18:51:10 +00:00
Fan Zhang
f5746f9078
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
2016-05-12 18:41:11 +00:00
Fan Zhang
50cde75ef7
Update suggestion/support UI to use more negative space.
...
Bug: 28435214
-- Tweaked layout and padding in suggestions and support tab.
-- Added support to show different text color in SlidingTabLayout.
Change-Id: If5d90ec5360e35565176aae7475e355c27fcef7c
2016-05-12 11:14:59 -07:00
Maurice Lam
6de1c7e4f0
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44
...
am: 3fdb526bbd
* commit '3fdb526bbd7959ea5959922d86387232063b91a9':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: Ib86a8883fd042f796fa83e9a9b341c94efea89a6
2016-05-12 17:50:44 +00:00
Maurice Lam
3fdb526bbd
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
...
am: aead073d44
* commit 'aead073d4494c6b764cb384cdb96c79ec5a37aa5':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: I66c985b54718ff2a6e66b54ba67d4ccae44a09c6
2016-05-12 17:47:46 +00:00
Maurice Lam
d0035fd621
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
...
am: aead073d44
* commit 'aead073d4494c6b764cb384cdb96c79ec5a37aa5':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: I130a82b74299ec5f358f6040e54974e4661e6dbb
2016-05-12 17:47:45 +00:00
Maurice Lam
aead073d44
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
2016-05-12 17:42:19 +00:00
Maurice Lam
df055a4ac2
Set Wi-Fi dialog spinners to 48dps tall
...
Set the minimum height to align with the accessibility guidelines
and to disable ripple projection.
Also adds scroll indicators to the scroll view.
Bug: 28683023
Change-Id: I24c58c0d6e8ef4b9efc8b3f877bcd659f42b6c6d
2016-05-11 14:41:46 -07:00
Maurice Lam
b0df332c35
Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev
...
am: 8b649c0558
* commit '8b649c055859e9d67353980aaf1dd2c62bdcfe06':
Fix truncated text in pattern lock setup
Change-Id: I22db81a7c6ff572d0ebeb7998392da82d98234d2
2016-05-11 20:14:58 +00:00
Maurice Lam
8b649c0558
Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev
2016-05-11 20:05:18 +00:00
Sudheer Shanka
6c3bff4930
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76
...
am: eeeb02fefb
* commit 'eeeb02fefbb8d8e3dbe70a8862cf21ac9ac55736':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I46f14c2de931a132cc27bc678293f9e028812758
2016-05-11 19:22:24 +00:00
Sudheer Shanka
eeeb02fefb
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
...
am: 938501cf76
* commit '938501cf7634843460b03b6fe954e927166e1257':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I2aa5788fa98cf5ac128c161fcb0123b26eae1d7b
2016-05-11 19:14:11 +00:00
Sudheer Shanka
28c44ebf65
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
...
am: 938501cf76
* commit '938501cf7634843460b03b6fe954e927166e1257':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I7d9b313218cce94d6711d4ffa5df9a3c99d391c0
2016-05-11 19:13:46 +00:00
Sudheer Shanka
938501cf76
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
2016-05-11 19:04:20 +00:00
Maurice Lam
7b6791d126
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-11 11:23:43 -07:00
Maurice Lam
96aaeafa91
Merge "Fix truncated text in pattern lock setup" into nyc-dev
...
am: 353cdee69e
* commit '353cdee69e492f4571025644009024e3a1b10898':
Fix truncated text in pattern lock setup
Change-Id: I470a2267b051eb394ed95f9c7443786fbf911836
2016-05-11 18:15:35 +00:00
Maurice Lam
353cdee69e
Merge "Fix truncated text in pattern lock setup" into nyc-dev
2016-05-11 18:04:26 +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
TreeHugger Robot
277b7a81bd
Merge "Add list item to open tips & tricks." into nyc-mr1-dev
2016-05-10 20:31:09 +00: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
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
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
Baligh Uddin
37bd336595
Import translations. DO NOT MERGE
...
Change-Id: I433f23d9ad9b6831b6a94c5f13dde7fa9e521c3b
Auto-generated-cl: translation import
2016-05-10 10:39:45 -07: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
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
TreeHugger Robot
43a4e5f4ea
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-09 18:17:36 +00:00
TreeHugger Robot
4e5641bfa8
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-09 18:17:33 +00:00
Sudheer Shanka
2ad6adbd58
Add policy transparency to app notification settings on lockscreen.
...
Bug: 28390118
Change-Id: I395440b0f7e93da90f9f346574afa5501761d473
2016-05-09 10:57:34 -07:00