Jason Monk
1a49ebc1af
Merge "Remove some of the unused assets" into nyc-dev
...
am: 8b8002b
* commit '8b8002b50831e8c93df0f04e2e6605719585b985':
Remove some of the unused assets
Change-Id: Ib957eafa08cfb05c14ee9e87e9f86d9895f606aa
2016-04-20 20:48:42 +00:00
TreeHugger Robot
8b8002b508
Merge "Remove some of the unused assets" into nyc-dev
2016-04-20 20:42:55 +00:00
Ruben Brunk
0db43e44d0
Merge "Add settings for altering VR display behavior." into nyc-dev
...
am: 3a3d110
* commit '3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
Add settings for altering VR display behavior.
Change-Id: I051c2374bfc6ecaafff178e06079434958f53136
2016-04-20 20:04:03 +00:00
Ruben Brunk
3a3d110a50
Merge "Add settings for altering VR display behavior." into nyc-dev
2016-04-20 19:51:50 +00:00
Ruben Brunk
e4d95c087b
Add settings for altering VR display behavior.
...
Bug=28208992
Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8
2016-04-20 12:49:05 -07:00
Jason Monk
7f4a231d89
Remove some of the unused assets
...
Probably didn't get them all, but this is good enough for now.
Change-Id: I86637d7ae1e31ba9cd625589fa1e4ded32cca4b3
Fixes: 27816752
2016-04-20 15:10:08 -04:00
Fan Zhang
2869157ba9
Display setting and support in a tab layout - DO NOT MERGE
...
Bug: 28269035
Bug: 28139604
2016-04-20 11:42:15 -07:00
Udam Saini
415fef89f3
Fixes a string for tablets/devices
...
Had accidentally always set this to phone.
bug:28293197
Change-Id: I926e4c9681f2e7e660bdc2664256c8a7ea6e7951
2016-04-20 11:27:02 -07:00
Sudheer Shanka
14aa458510
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
...
am: c2dae39
* commit 'c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
Fix summaries of some restricted switch preferences.
Change-Id: Ie84937b155d8c5382bbb697c3f70fccaf28b897e
2016-04-20 18:16:26 +00:00
Sudheer Shanka
c2dae39ab4
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
2016-04-20 18:04:12 +00:00
Sudheer Shanka
c80d630559
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
...
am: b2f161a
* commit 'b2f161ab389469c7029efe4915aef06e9671ffdb':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: I22816dad3b6a96d36062f395847eec36db205363
2016-04-20 18:02:35 +00:00
Jason Monk
040acf7dab
Merge "Daydream -> Screen saver" into nyc-dev
...
am: ea80ebc
* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
Daydream -> Screen saver
Change-Id: I2536df1ef2c588a70f3820b15efda3b2fa366cae
2016-04-20 17:56:04 +00:00
Sudheer Shanka
b2f161ab38
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
2016-04-20 17:50:32 +00:00
Jason Monk
1ecc1f69b8
Daydream -> Screen saver
...
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243
2016-04-20 13:39:18 -04:00
Clara Bayarri
b4d55a2050
Remove Secure Startup option from Security Settings
...
Bug: 27440560
Change-Id: Iff700e4e759aea88f8e71f1fdff1837962f84a92
2016-04-20 15:02:44 +01:00
Sudheer Shanka
c779bece31
Apply policy transparency to "Stay awake" in Development settings.
...
Bug: 28271254
Change-Id: I203ce5c839e5f0201d287673ec3a48c8f835edc3
2016-04-19 22:49:45 -07:00
Sudheer Shanka
7e09747415
Fix summaries of some restricted switch preferences.
...
Bug: 27659072
Change-Id: I2cfb270ba77b0cfe3c81097b59779f70062b9b65
2016-04-19 21:46:31 -07:00
Andrew Sapperstein
13792886a7
Create feature factory interface & initial impl.
...
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.
Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.
BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
(cherry picked from commit 867bb9c07a
)
2016-04-19 23:01:49 +00:00
Maurice Lam
fd03c3b366
[Fingerprint] Update strings
...
Update the label for the options in setup to match the flow model of
setup wizard.
Bug: 28219260
Change-Id: Ia975b5fc95c7c82c5ec23a2af5dcdcd9d69bb594
2016-04-19 14:24:17 -07:00
Noah Wang
4f63bb69f5
Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev
2016-04-19 17:56:50 +00:00
Zoltan Szatmary-Ban
295f1060e9
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
2016-04-19 13:25:22 +00:00
Felipe Leme
c2ef27faf4
Handle blacklisted apps on Data Saver whitelist.
...
When user blacklists an app for background data access, the
"Unrestricted data access" list should not display the whitelist toggle
option, but rather explain background access is turned off and offer the
option to open the app's data usage screen to turn it back on.
It still does not handle changed received by DataSaverBackend, so the UI
will be stale when the user removes a blacklist and navigates back to
the list.
BUG: 27481520
Change-Id: I9d0fa9f0180a69ce9bd1417921bf89ec3ba31f01
2016-04-18 13:14:01 -07:00
Noah Wang
35a95617fd
Fix preview screen crashing and glitches for
...
Display / Font size
Bug: 28223545
Bug: 28223533
Bug: 28210654
Bug: 28210242
Bug: 28208955
Bug: 27699996
Change-Id: I80339dabbd089db8a6c6a80645baabb9b4cad00e
2016-04-18 13:08:56 -07:00
Shweta Chahar
da4ecea845
Merge "Add a button to reset pitch to default value." into nyc-dev
2016-04-18 15:14:24 +00:00
Ido Ofir
7f4892f223
Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev
2016-04-15 23:16:51 +00:00
Ido Ofir
81513d7a88
Changing dimensions and margins for fingerprint image in portrait mode.
...
Landscape layout remains the same with fixed size.
Bug: 27875410
Change-Id: I82ee12ef5efab8bee6a0e187810b399cb45b7f67
2016-04-15 13:30:01 -07:00
Zoltan Szatmary-Ban
3f6208170d
Apply policy transparency to HotspotCondition and WiFi settings...
...
...when there is an active hotspot and user restriction for disallowing
tether config is in effect. This is to avoid getting security exceptions
from WifiManager when engaging with HotspotCondition or Wifi enable switch.
Bug:27936528
Change-Id: Ib3324e853277c177966b55668758d349ffe6ecf5
2016-04-15 16:13:27 +01:00
Julia Reynolds
088fb52ef8
Notification slider changes.
...
Bug: 27558254
Change-Id: I15635ae19e82a57d6e6fcb2f8f946f31bebf5d0f
2016-04-15 11:04:13 -04:00
shwetachahar
aaf9df3b19
Add a button to reset pitch to default value.
...
Bug: 27949093
Change-Id: Ia7fd2f824b8e87c08f9e2f3defca6e645c5c1bfb
2016-04-15 15:56:13 +01:00
Sudheer Shanka
cdb089c96d
Merge "Add additional summaries for some restricted switch preferences." into nyc-dev
2016-04-14 21:05:25 +00:00
Oleksandr Peletskyi
9abb6b01f4
Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev
2016-04-14 10:46:08 +00:00
Noah Wang
7444be6f28
Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev
2016-04-14 05:10:49 +00:00
Noah Wang
6e1586150e
Merge "Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691" into nyc-dev
2016-04-14 05:10:34 +00:00
Sudheer Shanka
415bd9ece1
Add additional summaries for some restricted switch preferences.
...
For some of the switch preferences, we need the new summary
"Enabled/Disabled" so that the user know about the switch state but
we can't replace some existing summaries because they provide
context.
Bug: 27659072
Change-Id: I65aca79184f543ef3fc85634594cad75f516d2fa
2016-04-13 21:34:30 -07:00
Noah Wang
f3a20cc9bc
Instantiating background image of preview video in
...
Magnification Gesture screen using ImageView, also
set GlobalLayoutListener to adjust its position.
Bug: 27992162
Bug: 27901691
Change-Id: I9563eb2776bcde3d7edeb4a420a9b3c02481baf8
2016-04-13 19:02:41 -07:00
Julia Reynolds
cc43dd935f
Merge "Notification listeners have full DND access." into nyc-dev
2016-04-14 00:58:09 +00:00
Noah Wang
45393213da
Remove the preview screens from Display/Font size settings
...
when the activity height is smaller.
Also refactored for readability.
Bug: 27699996
Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf
2016-04-13 16:55:11 -07:00
TreeHugger Robot
6a41da8e9a
Merge "Data Saver Mode phrasing tweaks." into nyc-dev
2016-04-13 23:36:28 +00:00
Noah Wang
40c2e7adcf
Merge "Maintain higher color contrast of labels/controlls on the side of the SeekBar in PreviewPagerPreferenceFragment Bug: 27952877" into nyc-dev
2016-04-13 23:17:35 +00:00
Noah Wang
c528984785
Maintain higher color contrast of labels/controlls
...
on the side of the SeekBar in PreviewPagerPreferenceFragment
Bug: 27952877
Change-Id: I6fb173cfe5dce17c5cdf20dd90d601de19e44906
2016-04-13 14:07:24 -07:00
Felipe Leme
1e890cb8f7
Data Saver Mode phrasing tweaks.
...
BUG: 28133736
Change-Id: I29c293d001c54aa6aaff33fbc9d086cf9c50da98
2016-04-13 13:58:35 -07:00
Julia Reynolds
83f35ba88d
Notification listeners have full DND access.
...
Bug: 27976092
Change-Id: I9603d900d7cee5666ec3567b4f42fee6d93ae5f8
2016-04-13 16:55:31 -04:00
Jason Monk
906927f1c8
Merge "Settings dashboard tablet fixes" into nyc-dev
2016-04-13 19:11:15 +00:00
Sudheer Shanka
f13a6a1795
Merge "Add new section in Apps screen to show app installer name." into nyc-dev
2016-04-13 17:47:05 +00:00
Jason Monk
79f3706785
Settings dashboard tablet fixes
...
Change-Id: I21b306f6932af4fc2c5b79feeba60cdd820e2b8a
Fixes: 27834674
2016-04-13 12:24:54 -04:00
Robin Lee
80c5d6db75
Merge "Include login/alwayson in legacy VPN editor dialog" into nyc-dev
2016-04-13 15:26:45 +00:00
Robin Lee
20ddd1c57b
Include login/alwayson in legacy VPN editor dialog
...
A little more consistent with the new app VPNs' dialogs. To make this
work it was also necessary to restart the lockdown VPN every time it is
edited, which makes sense because the expected action after editing a
VPN is that it reconnects with the new settings.
Bug: 28072644
Change-Id: I4b6a6f0a6ed96d2ec6f62889fdae4abb60d0646c
2016-04-13 14:57:54 +01:00
Victor Chang
60c76357a0
Merge ""CA cert installed" notification should take PO into account" into nyc-dev
2016-04-13 10:15:28 +00:00
Victor Chang
17ead044e1
"CA cert installed" notification should take PO into account
...
- PO shows same dialog as DO, as shown in UI mock
- Keep consumer message the same
- Add cancel button
- string change
- remove TYPE_SYSTEM_ALERT due to the bug that the dialog is shown in primary user and bypass work challenge
(Step: unlock work user -> launch dialog -> lock work user -> unlock personal user -> the dialog is still shown)
- Remove dismissKeyguard, because I believe the dialog should still be protected by the keyguard
Bug: 25772443
Bug: 18224038
Change-Id: I4f2580d1f6d2f88cfeadebcf6e8b0406e5c4b413
2016-04-13 11:13:58 +01:00
Nathan Harold
0887ace344
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
2016-04-13 07:37:38 +00:00