Commit Graph

27212 Commits

Author SHA1 Message Date
Chris Wren
0a13cfbf8e Merge \"log as counters instead of histograms\" into nyc-dev
am: 6913b6118f

Change-Id: Ic3178f2514097df73527f446a5daf11fc6c25acc
2016-06-15 18:17:52 +00:00
TreeHugger Robot
6913b6118f Merge "log as counters instead of histograms" into nyc-dev 2016-06-15 18:13:53 +00:00
Daniel Nishi
0074855229 Show storage manager settings using a system property.
This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.

Bug: 29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3
2016-06-15 11:01:58 -07:00
Maurice Lam
a028010c23 Merge "Update UI style for GLIF buttons" into nyc-mr1-dev 2016-06-15 17:07:54 +00:00
Maurice Lam
e33872772c Merge "Fingerprint string updates" into nyc-mr1-dev 2016-06-15 17:07:27 +00:00
Jason Monk
2f4c80f3c7 Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am: b53117f55c

Change-Id: I49ceb02471844e719da35f1939c329f317b6953b
2016-06-15 16:59:09 +00:00
TreeHugger Robot
b53117f55c Merge "Fix SimStatus updatePhoneInfos" into nyc-dev 2016-06-15 16:48:45 +00:00
Ricky Wai
5ec65517a6 Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am: 42cbbc3052

Change-Id: Ia46cdcee9c65d7394896e34e216f19dc1e7a5d31
2016-06-15 16:38:28 +00:00
Jason Monk
b2e2007766 Merge "resolve merge conflicts of f4ad443 to nyc-mr1-dev" into nyc-mr1-dev 2016-06-15 16:37:16 +00:00
Chris Wren
1753dfd5cd log as counters instead of histograms
this will interoperate better with UMA

Bug: 26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
2016-06-15 12:36:38 -04:00
Fan Zhang
1c6674dbb2 Merge "Remove forum link from support tab." into nyc-mr1-dev 2016-06-15 16:15:54 +00:00
Ricky Wai
42cbbc3052 Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev 2016-06-15 16:02:18 +00:00
Jason Monk
90bde71e20 resolve merge conflicts of f4ad443 to nyc-mr1-dev
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
2016-06-15 11:31:14 -04:00
Jason Monk
c7959f91d5 Fix SimStatus updatePhoneInfos
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.

Also return the right view in onCreateView

Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes: 29335528
2016-06-15 10:54:33 -04:00
Jason Monk
f4ad4434f1 Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev 2016-06-15 14:53:43 +00:00
Maurice Lam
4659661821 Fingerprint string updates
Bug: 29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999
2016-06-14 19:14:37 -07:00
Maurice Lam
52ae1eb04b Update UI style for GLIF buttons
Bug: 29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725
2016-06-14 18:35:37 -07:00
Julia Reynolds
f04499b2e1 Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am: b2301cb4c2

Change-Id: I9d5f2f4957bdc86ab25e0436100f5b126cb97bb7
2016-06-14 22:30:19 +00:00
TreeHugger Robot
b2301cb4c2 Merge "Prevent users from blocking system notifications." into nyc-dev 2016-06-14 22:25:26 +00:00
Fan Zhang
156453c0ad Remove forum link from support tab.
Bug: 29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244
2016-06-14 13:01:45 -07:00
Fan Zhang
cf605973b2 Align text for conditions with text for other tiles.
Bug: 29107343

Text should be 72dp from left of screen, not 76dp.

Change-Id: I86cb015ed2e574c3f16fb642d7c3653a6f2a017f
2016-06-14 12:44:48 -07:00
Fan Zhang
cac9227e16 Merge "Support tab UI polish." into nyc-mr1-dev 2016-06-14 19:26:29 +00:00
Sanket Padawe
8b1acb7973 Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899
2016-06-14 18:04:52 +00:00
Fan Zhang
31405d0023 Support tab UI polish.
Bug: 29107343
Bug: 29101595

1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.

Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c
2016-06-14 10:30:23 -07:00
Sanket Padawe
fb87919fde Fix bug in Sim Status Settings.
Bug: 29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
2016-06-14 10:12:39 -07:00
Sunny Goyal
fef6234ebc Merge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config." into nyc-mr1-dev 2016-06-14 16:51:09 +00:00
Sunny Goyal
0bf6f94c58 Changing the WallpaperSuggestionActivity to redirect to the actual
wallpaper picker component defined in the config.

Bug: 28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e
2016-06-14 09:44:10 -07:00
Anna Galusza
78a0197320 Merge "Remove "Help & feedback" from toggle screen for accessibility services to prevent confusion when users are trying to submit feedback for a specific accessibility service (accessibility services can place their own "Help & feedabck" in their apks and route it appropriately). Bug: 29278252" into nyc-mr1-dev 2016-06-14 16:09:24 +00:00
Ricky Wai
dae1ac5cb0 Remove work fingerprints when primary profile lock is removed
Bug: 29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083
2016-06-14 14:43:00 +01:00
Bill Yi
fee9c49fb2 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 7221f5b6b4  -s ours

Change-Id: I638873a702599a87476abd1ef92734099dca3c76
2016-06-14 12:09:38 +00:00
TreeHugger Robot
35b37f1c2e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-14 12:04:54 +00:00
TreeHugger Robot
7221f5b6b4 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-14 11:47:34 +00:00
Bill Yi
aba253e6c7 Import translations. DO NOT MERGE
Change-Id: I06952539cefb81ca62a8fde4455f1f3e3ba92f67
Auto-generated-cl: translation import
2016-06-14 03:33:30 -07:00
Bill Yi
0f30207710 Import translations. DO NOT MERGE
Change-Id: I4dca3edd37931754e3ba3d6152bde6fe235e7b42
Auto-generated-cl: translation import
2016-06-14 03:17:02 -07:00
Julia Reynolds
9850695bfc DND header should be translated.
am: 5a67d5f6f0

Change-Id: I238ebd6abe78925fde071b3fb09b27690e6d6311
2016-06-14 01:57:37 +00:00
Julia Reynolds
5a67d5f6f0 DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731
2016-06-14 01:47:05 +00:00
TreeHugger Robot
8b8a012913 Merge "Added new setting for gestures." into nyc-mr1-dev 2016-06-13 22:01:45 +00:00
Daniel Nishi
584320adb8 Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev 2016-06-13 21:18:29 +00:00
Doris Ling
9136523a43 Added new setting for gestures.
Added a new entry to the top level Settings' Device section to
enable/disable gestures.

Bug: 28565958

Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
2016-06-13 13:13:21 -07:00
Daniel Nishi
776c9eca39 Use Settings.Secure for days to retain.
Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.

Bug: 28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e
2016-06-13 10:47:23 -07:00
Michal Karpinski
b57c55d42c Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am: 86c9894f04

Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35
2016-06-13 17:40:13 +00:00
TreeHugger Robot
86c9894f04 Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev 2016-06-13 17:29:22 +00:00
Jason Monk
f01d1d5dcb Make linkify handle emptys urls better DO NOT MERGE
Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes: 29045818
2016-06-13 13:08:32 -04:00
Julia Reynolds
cdd1a26465 Prevent users from blocking system notifications.
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes: 29191134
2016-06-13 12:49:45 -04:00
Robin Lee
442498681d Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am: cab4f9dc39

Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49
2016-06-13 16:15:20 +00:00
Robin Lee
cab4f9dc39 Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev 2016-06-13 16:03:54 +00:00
Michal Karpinski
5666e5556f Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog
Removing because user might not be able to remove (because the option is disallowed).

Bug: 29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
2016-06-13 16:52:58 +01:00
Robin Lee
49be1c1b06 Respect DISALLOW_CONFIG_VPN for disconnect dialog
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix: 29265163
2016-06-13 15:08:32 +00:00
Nicolas Prevot
1ba2cbbfc2 Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am: 98704bc495

Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14
2016-06-13 12:50:11 +00:00
Nicolas Prévot
98704bc495 Merge "Fix rendering of policy transparency activity." into nyc-dev 2016-06-13 12:37:05 +00:00