Maurice Lam
498ec55ba3
Merge "[Fingerprint] Update strings" into nyc-dev
2016-04-21 22:06:04 +00:00
Jason Monk
fcc592c6ac
Merge "Screen saver string fixes" into nyc-dev
...
am: 990ef94b64
* commit '990ef94b646f6d38fa8a44ee26f211014969e08e':
Screen saver string fixes
Change-Id: I4286c726e1faa245860cd038ae037c88a5efc72f
2016-04-21 15:58:01 +00:00
Jason Monk
ac663d2ff5
Screen saver string fixes
...
Change-Id: I609509787e5f7f9f03eb0e478ab358fe930b0678
Fixes: 28268243
2016-04-21 11:50:58 -04:00
Tony Mak
7655be05c1
New UI to hint user about strong auth
...
Instead of having a separate textview, we now reuse the detail textview
to show the hint.
Fix: 28204828
Change-Id: I3eff3240bf7ecb1495fbf11a073a273a0de603ae
2016-04-21 10:27:43 +01:00
Udam Saini
f21a205ff3
Merge "Fixes a string for tablets/devices" into nyc-dev
...
am: e0892e1
* commit 'e0892e16adb55e3f0b368b9d461efae09bf38c5b':
Fixes a string for tablets/devices
Change-Id: I63f0475602c2ca19053387ca7c08e6881828a22e
2016-04-20 21:42:22 +00:00
Jason Monk
e29e622b4e
Merge "Remove some of the unused assets" into nyc-dev
...
am: 8b8002b
* commit '8b8002b50831e8c93df0f04e2e6605719585b985':
Remove some of the unused assets
Change-Id: Ibcbcd933131aa12feb5b226c76a943d947c77db0
2016-04-20 21:42:22 +00:00
Ruben Brunk
a72edfb23d
Merge "Add settings for altering VR display behavior." into nyc-dev
...
am: 3a3d110
* commit '3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
Add settings for altering VR display behavior.
Change-Id: I63640eedc5729ff34a388f2914e9c60ce7c715df
2016-04-20 21:42:20 +00:00
Sudheer Shanka
122b781d3a
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
...
am: c2dae39
* commit 'c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
Fix summaries of some restricted switch preferences.
Change-Id: If7fb847fb1a995d92519ec223492cee6711ec46a
2016-04-20 21:42:20 +00:00
Sudheer Shanka
5a80da4bd1
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: Ifa4602bf64c12d47030e71068c80733bf6d88bfa
2016-04-20 21:42:19 +00:00
Jason Monk
a60e5b52d8
Merge "Daydream -> Screen saver" into nyc-dev
...
am: ea80ebc
* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
Daydream -> Screen saver
Change-Id: Ia6454ece816ef711261094fceab046563c723514
2016-04-20 21:42:18 +00:00
Udam Saini
e0892e16ad
Merge "Fixes a string for tablets/devices" into nyc-dev
2016-04-20 20:54:41 +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
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
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
c2dae39ab4
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
2016-04-20 18:04:12 +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
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
1c94e6dd90
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
...
am: 4f63bb6
* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996
Change-Id: Ie9845c3f043d9fcb0733fe7204696b5792d8e9d9
2016-04-19 18:07:20 +00: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
f89218e281
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
...
am: 295f106
* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
Apply policy transparency to HotspotCondition and WiFi settings...
Change-Id: Ia7518fe9369e9f045ca120d1cb91ca81db0a5836
2016-04-19 13:32:20 +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
90a3102abd
Handle blacklisted apps on Data Saver whitelist.
...
am: c2ef27f
* commit 'c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
Handle blacklisted apps on Data Saver whitelist.
Change-Id: Ia221750b24003af71c6dd106b1247d7178573cf4
2016-04-18 22:38:41 +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
shwetachahar
3cf8d61458
Merge "Add a button to reset pitch to default value." into nyc-dev
...
am: da4ecea
* commit 'da4ecea84517b4071bef3ae6c6b1eb180a890008':
Add a button to reset pitch to default value.
Change-Id: Ib8be9f4d0d5ff5b2a028ab83df3b271b6377b30c
2016-04-18 15:22:54 +00: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
5a9cff708f
Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev
...
am: 7f4892f
* commit '7f4892f223ec265fdee5223fdec92440849160ac':
Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size.
Change-Id: Iacab34944705d4ad8e49d9b32fecdfa0cc9cd40b
2016-04-15 23:24:34 +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
Julia Reynolds
29eeaf9530
Merge "Notification slider changes." into nyc-dev
...
am: 8b01df5
* commit '8b01df5d7869b392ad542b5c27fe8dd21b8759ba':
Notification slider changes.
Change-Id: Ibb5c1fc046096c0c1b3c04367d95b557d2291997
2016-04-15 15:32:17 +00: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
371804159c
Merge "Add additional summaries for some restricted switch preferences." into nyc-dev
...
am: cdb089c
* commit 'cdb089c96d9b23d389619783ff68cb333daf6b27':
Add additional summaries for some restricted switch preferences.
Change-Id: I8640613299b71a2a4c60ef49a363508541234bc5
2016-04-14 21:19:26 +00: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
dfa04e2017
Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev
...
am: 9abb6b0
* commit '9abb6b01f45bb6fbabf3235f989286783db1a7ae':
Improved UX for DISALLOW_SET_USER_ICON restriction.
Change-Id: I7ea20af30bb84529cdc971ecdc9f41ac0a188751
2016-04-14 10:53:21 +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
36b15ba0be
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
...
am: 7444be6
* commit '7444be6f289f72b09551b4ee865ad6beb157e5e6':
Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf
Change-Id: Ia5097feabb5da6713634a2466a15b0c809d6ea58
2016-04-14 05:15:02 +00:00
Noah Wang
105c088d8f
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
...
am: 6e15861
* commit '6e1586150e5e97b4f7f0bdd15b380c99b668770b':
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: I1713e7dc4ba7b17ecbd9bb472e3b3ac72056befb
2016-04-14 05:15:02 +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
de8799cc03
Merge "Notification listeners have full DND access." into nyc-dev
...
am: cc43dd9
* commit 'cc43dd935f654b133e84c3cd745d1e8cf52e3959':
Notification listeners have full DND access.
Change-Id: I7d968d327cb7d17c130bb7d8945747b6d4d025a3
2016-04-14 01:07:18 +00:00