Ricky Wai
5ec65517a6
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
...
am: 42cbbc3052
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
2016-06-15 16:25:27 +00:00
Fan Zhang
b7e08a4fc6
Merge \"Remove forum link from support tab.\" into nyc-mr1-dev
...
am: 1c6674dbb2
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
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
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
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
2016-06-14 22:33:34 +00:00
Julia Reynolds
7803e3f76b
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
2016-06-14 22:30:33 +00:00
Julia Reynolds
f04499b2e1
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
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
2016-06-14 19:33:35 +00:00
Fan Zhang
26904db4bc
Merge \"Support tab UI polish.\" into nyc-mr1-dev
...
am: cac9227e16
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
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
2016-06-14 18:07:13 +00:00
Sanket Padawe
be5fbd9954
Fix bug in Sim Status Settings.
...
am: fb87919fde
2016-06-14 18:04:52 +00:00
Sanket Padawe
8b1acb7973
Fix bug in Sim Status Settings.
...
am: fb87919fde
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
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
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
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
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
Roozbeh Pournader
a7cb91821a
Merge "Make strings for data usage easier to localize"
2016-06-14 00:38:58 +00:00
Doris Ling
827acb4987
Merge \\"Added new setting for gestures.\\" into nyc-mr1-dev am: 8b8a012913
...
am: 71e6b9a4d9
2016-06-13 23:17:22 +00:00
Daniel Nishi
36d06f6710
Merge \\"Use Settings.Secure for days to retain.\\" into nyc-mr1-dev am: 584320adb8
...
am: 08ba377569
2016-06-13 22:48:56 +00:00
Roozbeh Pournader
0761a4bf06
Make strings for data usage easier to localize
...
The strings were complex to localize, especially since they used
formatting that needed to be carefully reconstructed for cases where
the amount of data appears in the middle of a string. Also, we
already had a localization for file sizes, which we should avoid
redoing, to minimize discrepancies.
Finally, we are now bidi wrapping the usage amount, as it may break
in the RTL locales otherwise, since the RTL locales may be using
Latin abbreviations for gigabyte etc that are LTR.
Since formatting needs to be applied to everything except the number
of units in the amount of data used, and markup should be avoided
since it will confuse bidi wrapping, the code carefully constructs
CharSequence templates that are then decorated with spans after
getting filled in.
Bug: 28747101
Change-Id: I18756b4de99eb551a51fe5e74d1c9cf505551f08
2016-06-13 15:34:00 -07:00
Doris Ling
71e6b9a4d9
Merge \"Added new setting for gestures.\" into nyc-mr1-dev
...
am: 8b8a012913
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
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
Robert Greenwalt
1bd411f64a
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp am: 89b8babe6a
...
am: 69118dc9b1
2016-06-13 20:14: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
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
