Commit Graph

12411 Commits

Author SHA1 Message Date
Jason Monk
4edb76127c Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
am: e3eaa08742

Change-Id: I891dcc41ec37a1de641beeb3690695fdab385e66
2016-06-15 16:58:59 +00:00
Jason Monk
e3eaa08742 Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am: b53117f55c

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

Change-Id: Iaf25d93b2926b985d8cad2c9e9923c819486d21e
2016-06-15 16:42:05 +00:00
Jason Monk
359c8343dd Merge \"resolve merge conflicts of f4ad443 to nyc-mr1-dev\" into nyc-mr1-dev
am: b2e2007766

Change-Id: I1c135d7ff2977d5f5f5855e8fa7649303deef565
2016-06-15 16:42:04 +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
Fan Zhang
b7e08a4fc6 Merge \"Remove forum link from support tab.\" into nyc-mr1-dev
am: 1c6674dbb2

Change-Id: I35349cfef2f68057dbd80ea04a8851f5fc54860a
2016-06-15 16:17:20 +00: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
0f747c979d Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am: 42cbbc3052

Change-Id: I736dcaa1c92c0557559719054f0177eb9cf1fc24
2016-06-15 16:04:41 +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
4904ba543e Merge \"Make linkify handle emptys urls better DO NOT MERGE\" into nyc-dev
am: f4ad4434f1

Change-Id: Ic52d42c920c29942dbcca880fa70bdde69cb1960
2016-06-15 15:03:26 +00: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
Julia Reynolds
a9f6b69398 Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am: b2301cb4c2
am: f04499b2e1

Change-Id: I9253ee4788f3e3bf6918a98fc2a2c4927d920114
2016-06-14 22:33:34 +00:00
Julia Reynolds
7803e3f76b Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am: b2301cb4c2

Change-Id: I43783338afaf01a3c22ab409a3c8836f6a36550f
2016-06-14 22:30:33 +00: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
26904db4bc Merge \"Support tab UI polish.\" into nyc-mr1-dev
am: cac9227e16

Change-Id: I64062459148a6fd38f223eef92cc1680e38423c9
2016-06-14 19:31:15 +00:00
Fan Zhang
cac9227e16 Merge "Support tab UI polish." into nyc-mr1-dev 2016-06-14 19:26:29 +00:00
Sanket Padawe
30341d7924 Fix bug in Sim Status Settings. am: fb87919fde
am: 8b1acb7973

Change-Id: I8d8c7ef15e81530ce21849eb2ff034ea10b2ea13
2016-06-14 18:07:13 +00:00
Sanket Padawe
be5fbd9954 Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I696fa92d6ae21a9df386c60287da0ed298f3615d
2016-06-14 18:04:52 +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
4dae8c2769 Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev
am: fef6234ebc

Change-Id: I602f81cfeea807b3c63799eb7b9985e0053ed583
2016-06-14 17:00:56 +00: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
d2961ede2e 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
am: 78a0197320

Change-Id: I0b6ba08845b6e58e1ecd314ff1e59c08be0c7beb
2016-06-14 16:18:18 +00: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
Doris Ling
71e6b9a4d9 Merge \"Added new setting for gestures.\" into nyc-mr1-dev
am: 8b8a012913

Change-Id: I3bec17fcf1130c4948abeef256a169105d7ad464
2016-06-13 22:29:14 +00:00
Daniel Nishi
08ba377569 Merge \"Use Settings.Secure for days to retain.\" into nyc-mr1-dev
am: 584320adb8

Change-Id: Ifd3f1542b9feb2747a54f380ff7047868e563251
2016-06-13 22:28:38 +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
宋凯伦
69118dc9b1 resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
am: 89b8babe6a

Change-Id: I5918f6a061ab0d5f3d81b99174d5517cd44e389c
2016-06-13 20:10:42 +00:00
Robert Greenwalt
89b8babe6a resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
2016-06-13 13:01:36 -07:00
Robert Greenwalt
03393c4109 Merge "Fix the memory leak in TetherSettings" 2016-06-13 18:35:32 +00: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
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
b5b2fd5204 Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39
am: c7f0f2338a

Change-Id: Ic885afb2eeda787f6a1f65da58db62f8485e285c
2016-06-13 16:19:10 +00: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
c7f0f2338a Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am: cab4f9dc39

Change-Id: Ic81454dfe7e6d7d7d0586e2b5eb38770d93e9377
2016-06-13 16:15:19 +00:00
Robin Lee
cab4f9dc39 Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev 2016-06-13 16:03:54 +00: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 Prévot
21693422b4 Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495
am: 341b21d2f8

Change-Id: I9c7edec1124d042d045e7dbed77f75c6ec787b6b
2016-06-13 12:54:36 +00:00