Commit Graph

9126 Commits

Author SHA1 Message Date
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
Victor Chang
f5b2fea636 Show a different Root CA string for device owner
Bug: 28627835
Change-Id: Iab750dbe7099336b664ef66892cbf2c1b89a9e8e
2016-05-09 16:41:45 +01:00
Jason Monk
fc5f0d4d20 Merge "Dashboard performance work" into nyc-dev am: 04b25af149
am: 96eedcfdd2

* commit '96eedcfdd24a0cda4a56843a55f448367e8518c8':
  Dashboard performance work

Change-Id: Ifdb7fa74850c8a4a217ed9f706b2bc3cdcad9be4
2016-05-09 13:44:38 +00:00
Jason Monk
4a36e0b3fc Merge "Dashboard performance work" into nyc-dev
am: 04b25af149

* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
  Dashboard performance work

Change-Id: Ib85705ab2984d6b8229181709a762dfbcf6341c0
2016-05-09 13:40:55 +00:00
Jason Monk
96eedcfdd2 Merge "Dashboard performance work" into nyc-dev
am: 04b25af149

* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
  Dashboard performance work

Change-Id: I41c9443c997428924b5ef6df2ad632c06bd416a8
2016-05-09 13:40:54 +00:00
Jason Monk
04b25af149 Merge "Dashboard performance work" into nyc-dev 2016-05-09 13:37:45 +00:00
Bill Yi
40225b58db Import translations. DO NOT MERGE
Change-Id: Ia72b6a7cc7ef24d407953bdfec981ac8a08d48de
Auto-generated-cl: translation import
2016-05-09 06:29:08 -07:00
Bill Yi
bb5730df59 Import translations. DO NOT MERGE
Change-Id: I6e9f10288cb94440b0f46bd5405ed996168efcbf
Auto-generated-cl: translation import
2016-05-09 06:22:15 -07:00
Victor Chang
0d16f639bc Merge "TrustCredentials listview should be expanded by default" into nyc-dev
am: 963c3a4e9f

* commit '963c3a4e9f06808c098fe3de4aaec5033431f21d':
  TrustCredentials listview should be expanded by default

Change-Id: I4edd0c7687a8951456152f334a3a169c817f8ec1
2016-05-07 05:30:11 +00:00
Pavlin Radoslavov
3d4a586b80 resolve merge conflicts of 8fa3d44 to nyc-mr1-dev
Change-Id: I1eea61da6904c5d2c181962ff5bac75454d2929d
2016-05-06 18:57:18 -07:00
Jason Monk
2386dfc18d Dashboard performance work
Push more stuff to backround threads (this will cause conditions/suggestions
to load slightly slower than normal content) and cache more info.

Fixes: 28613950
Bug: 28435146
Change-Id: I1080930e8f31c7f12a2d89f266bfd3236979cf40
2016-05-06 13:17:47 -04:00
Fan Zhang
789b3c9b51 Merge "Update support email/chat display string." into nyc-mr1-dev
am: 6d2dd23f85

* commit '6d2dd23f85006dfd32ac3e47f3a6ef8235469d17':
  Update support email/chat display string.

Change-Id: Iac53a8886e5c2f8eaa7d7a00078878e240877c9a
2016-05-06 15:57:35 +00:00
Fan Zhang
6d2dd23f85 Merge "Update support email/chat display string." into nyc-mr1-dev 2016-05-06 15:45:31 +00:00
Robin Lee
084b1fc864 Merge "TrustCredentials listview should be expanded by default" into nyc-dev am: 963c3a4e9f
am: d48f9cf78e

* commit 'd48f9cf78e21924306855da02c71f9b65407b117':
  TrustCredentials listview should be expanded by default

Change-Id: I8f746b6b53ee17362f998bde5452ff4b447de2c3
2016-05-06 15:38:39 +00:00
Victor Chang
d48f9cf78e Merge "TrustCredentials listview should be expanded by default" into nyc-dev
am: 963c3a4e9f

* commit '963c3a4e9f06808c098fe3de4aaec5033431f21d':
  TrustCredentials listview should be expanded by default

Change-Id: I5ac13d383e7565acade2272c805e20b67fdc856a
2016-05-06 15:33:52 +00:00
Robin Lee
963c3a4e9f Merge "TrustCredentials listview should be expanded by default" into nyc-dev 2016-05-06 15:27:42 +00:00
Victor Chang
9583dcecce TrustCredentials listview should be expanded by default
UI Change for 2-profile case:
1. When both personal and work listview are expanded, half height is allocated for each list view
2. When only one listview is expanded, full height is allocated to the list view

Video can be found at go/trust-cred-split-view

- Use 2 ListView instead of 1 ExpandableListView in order to scoll the list independently
- The ui is not changed for only one or more than 3 profiles.
- Remove TrustedCertificateAdapterCommons, and wrap GroupAdapter by ChildAdapter in order to re-use more codes
- clear mAliasLoaders in onDestroy. (Seems it's a bug.)
- When work mode or fbe locked, force to collapse work list view. User message will be prompted when user press on header
- Groups in GroupAdapter is set synchronously instead of async, since we assume the number of users are fixed during initialization
- DataSet events will go through GroupAdapter to notifiy ChildAdapter

Bug:28236955
(cherry picked from commit 7dde845544)

Change-Id: I87293afc56e9cc270c2289111bab6f1809351faf
2016-05-06 12:55:18 +00:00
Bill Yi
fb917b0b5d Import translations. DO NOT MERGE
Change-Id: Idd3405760f34528ea4561057609d438bd0871a0b
Auto-generated-cl: translation import
2016-05-05 21:41:59 -07:00
Bill Yi
8dd2b70073 Import translations. DO NOT MERGE
Change-Id: Iff19a526307de6bd652ba382c1914098f13583e0
Auto-generated-cl: translation import
2016-05-05 21:35:29 -07:00
pkanwar
7fe0c25f77 resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp
Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227
2016-05-05 18:53:08 -07:00
Fan Zhang
a6bd54591a Update support email/chat display string.
Bug: 28141203

Also removed unnecessary padding restriction in layout so button width
can grow.

Change-Id: I2805cf161407b16544bd2dcb89d56ba8f11669b9
2016-05-05 13:55:46 -07:00