Commit Graph

12851 Commits

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

Change-Id: I240cf8faefd48766a64893756c20c4ebfed83de6
2016-06-15 19:12:43 +00:00
Chris Wren
a0e9f47a69 Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f
am: 0a13cfbf8e

Change-Id: Idd702a08ce45c528cf91b0b79ce8249432dc3cca
2016-06-15 18:22:17 +00:00
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
Sudheer Shanka
d98cba58c8 Merge "Make guest field unselectable only if it is not disabled by admin." 2016-06-15 17:58:10 +00:00
Jason Monk
16da0e3c98 Merge \\\"Fix SimStatus updatePhoneInfos\\\" into nyc-dev am: b53117f55c am: e3eaa08742
am: 4edb76127c

Change-Id: I8d61851d4f4e27ef661630ec9cab788f85003383
2016-06-15 17:32:32 +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
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
Ricky Wai
c40c60841c Merge \\\"Remove work fingerprints when primary profile lock is removed\\\" into nyc-dev am: 42cbbc3052 am: 5ec65517a6
am: ea25035866

Change-Id: Idbf1017bb90fb8d875cb3b721013954d87dd43d2
2016-06-15 16:52:50 +00:00
Jason Monk
9e560413c6 Merge \\"resolve merge conflicts of f4ad443 to nyc-mr1-dev\\" into nyc-mr1-dev am: b2e2007766
am: 359c8343dd

Change-Id: If583064958771877190821b66d90974b8e94b692
2016-06-15 16:52:48 +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
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
2c1e5b1ba5 Merge \\"Remove forum link from support tab.\\" into nyc-mr1-dev am: 1c6674dbb2
am: b7e08a4fc6

Change-Id: Iaf50fb0512aff53dd6d4cdebc9e6600ecadfd1e0
2016-06-15 16:25:27 +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
7860cb0d0a Merge \\\"Prevent users from blocking system notifications.\\\" into nyc-dev am: b2301cb4c2 am: f04499b2e1
am: a9f6b69398

Change-Id: I9d04bed3022d346d136a08b81cf349775ff3c25e
2016-06-14 22:46:19 +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
700a38625f Merge \\"Support tab UI polish.\\" into nyc-mr1-dev am: cac9227e16
am: 26904db4bc

Change-Id: I9bfe9a2bf1d7d766cb7fbac10f5cfe5264e453e1
2016-06-14 19:33:35 +00: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
58cc43a80a Fix bug in Sim Status Settings. am: fb87919fde am: 8b1acb7973
am: 30341d7924

Change-Id: Icd5ef796dfe69641e1d93d567fe1b7db550215a3
2016-06-14 18:09:47 +00:00
Sudheer Shanka
29056b98f8 Make guest field unselectable only if it is not disabled by admin.
Change-Id: I01c45b686477615134e98428b673fe9bb2ab7b0b
Fixes: 29178926
2016-06-14 18:07:15 +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
110d3485c9 Merge \\"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\\" into nyc-mr1-dev am: fef6234ebc
am: 4dae8c2769

Change-Id: Ifa4e98aeea2d7a4ecf641aee003892fa76d15d83
2016-06-14 17:06:14 +00: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
6513ace408 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
am: d2961ede2e

Change-Id: I4af859c7c06b58c82a3a20664f938abb88153289
2016-06-14 16:22:52 +00: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