Keith Cheung
9b167a6878
Merge "Include work app in battery optimization settings" into nyc-dev
2016-04-21 15:18:06 +00:00
Victor Chang
f2e02db61e
Disable trust button when no screenlock is set
...
Remove button is still allowed as it has been allowed in MNC
(Trust button is new in NYC)
Bug: 28161447
Change-Id: I8df73e1008c2e805f4d0b2ec68d8a4aa3bf75aba
2016-04-21 16:14:09 +01:00
Jason Monk
a2f7a5980e
Merge "Fix only one battery stat showing sometimes." into nyc-dev
...
am: 7bcc48f77d
2016-04-21 14:26:01 +00:00
Jason Monk
7bcc48f77d
Merge "Fix only one battery stat showing sometimes." into nyc-dev
2016-04-21 14:21:41 +00:00
Jason Monk
a627844fed
Fix only one battery stat showing sometimes.
...
Take into account the prefs we are currently caching within the
group when counting how many prefs have been added.
Change-Id: I962acd41592c1a9366882711d3f4944bffb54d22
Fixes: 27931457
2016-04-21 10:12:30 -04:00
Keisuke Kuroyanagi
172829299a
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
...
am: bf0e1338ec
2016-04-21 13:59:32 +00:00
Keith Cheung
2db5eccee4
Include work app in battery optimization settings
...
Fix: 23684151
Change-Id: If2d1a18838414122d8af57fda7138f87fd3f1e62
2016-04-21 14:45:37 +01:00
Keisuke Kuroyanagi
bf0e1338ec
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
2016-04-21 13:38:15 +00:00
Julia Reynolds
b6dfee89f7
Merge "Don\'t save a rule without a name." into nyc-dev
...
am: 257355afde
2016-04-21 12:46:43 +00:00
Julia Reynolds
257355afde
Merge "Don't save a rule without a name." into nyc-dev
2016-04-21 12:29:30 +00:00
Robin Lee
e06d757a0c
One updateSummary method called by all VPN prefs
...
Having multiple methods means inevitably when new features are added to
the preferences, the right calls aren't made so information on the
screen lags between updates.
Bug: 28257641
Change-Id: I336aeefd5941ccf808dc9070427209a7d2530032
(cherry picked from commit 903843e6f9
2016-04-21 12:06:46 +01: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
Yohei Yukawa
696bf679dd
Support IMEs that have no subtype in PhysicalKeyboardFragment.
...
With a Framework-side change [1],
InputManager#{get, set}KeyboardLayoutForInputDevice() are now able to
deal with null InputMethodSubtype as a valid input. With this CL, we no
longer filter out IMEs that do not support subtypes in
PhysicalKeyboardFragment.
[1]: Ia013784a594ad3beaf30976d047f5ac0fa8185be
Bug: 28182650
Change-Id: I46b9c5b018f08e3eaa4614a0893db0be91652f3c
2016-04-20 17:20:26 -07:00
Jim Miller
3e38542502
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
...
am: 25c0b7b
2016-04-20 21:46:04 +00:00
Jim Miller
25c0b7bc4e
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
2016-04-20 21:33:13 +00:00
Jim Miller
5a8e522c6c
Fix bug where fingerprint for wrong userId was attempted to be removed.
...
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.
Fixes bug 28268635
Change-Id: Ic8abfbf6fbf173db2d57a76ac2e38b2a71ffd19e
2016-04-20 14:06:00 -07:00
Udam Saini
be21812827
Merge "Fixes a string for tablets/devices" into nyc-dev
...
am: e0892e1
2016-04-20 21:04:30 +00:00
Udam Saini
e0892e16ad
Merge "Fixes a string for tablets/devices" into nyc-dev
2016-04-20 20:54:41 +00:00
Fan Zhang
01f177982d
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev
2016-04-20 20:50:17 +00:00
Jason Monk
1a49ebc1af
Merge "Remove some of the unused assets" into nyc-dev
...
am: 8b8002b
2016-04-20 20:48:42 +00:00
Jason Monk
a0a1055316
Merge "Add minimum date" into nyc-dev
...
am: 17b554c
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
Jason Monk
17b554c8b7
Merge "Add minimum date" into nyc-dev
2016-04-20 20:36:36 +00:00
Julia Reynolds
472526e53f
Don't save a rule without a name.
...
Bug: 28282339
Change-Id: Ie0a66f980c920354d172be4f0b91584338efce69
2016-04-20 16:08:30 -04:00
Ruben Brunk
0db43e44d0
Merge "Add settings for altering VR display behavior." into nyc-dev
...
am: 3a3d110
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
78f7b416c0
Add minimum date
...
Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes: 26346842
2016-04-20 15:44:21 -04: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
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
2016-04-20 18:02:35 +00:00
Jason Monk
040acf7dab
Merge "Daydream -> Screen saver" into nyc-dev
...
am: ea80ebc
2016-04-20 17:56:04 +00:00
Felipe Leme
4d1954f71f
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
...
am: 4f5568a
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
ea80ebcd92
Merge "Daydream -> Screen saver" into nyc-dev
2016-04-20 17:49:02 +00:00
TreeHugger Robot
4f5568a8a0
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
2016-04-20 17:44:55 +00:00
Jason Monk
1ecc1f69b8
Daydream -> Screen saver
...
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243
2016-04-20 13:39:18 -04:00
Jason Monk
18bf2fbdac
Merge "Fix sim status screen" into nyc-dev
...
am: e9dffcd
2016-04-20 17:32:39 +00:00
Jason Monk
e9dffcd34d
Merge "Fix sim status screen" into nyc-dev
2016-04-20 17:24:24 +00:00
Jason Monk
13d1c384e8
Fix sim status screen
...
Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes: 27963774
2016-04-20 13:22:36 -04:00
Jason Monk
018d99cd28
Merge "Fix storage title clearing in multi-window" into nyc-dev
...
am: 0bea8a9
2016-04-20 17:19:11 +00:00
Jason Monk
0bea8a9f48
Merge "Fix storage title clearing in multi-window" into nyc-dev
2016-04-20 17:08:29 +00:00
Jason Monk
f3446f98d5
Fix storage title clearing in multi-window
...
By accurately tracking detached state.
Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes: 27989238
2016-04-20 13:05:45 -04:00
Andrew Sapperstein
1d1a2694e9
Remove ToastController.
...
Wasn't meant to be submitted.
Change-Id: Icc94daaf47ed85cefb59f20928241ef38d5ee2ca
(cherry picked from commit 17047d1939
2016-04-20 16:54:13 +00:00
Andrew Sapperstein
12344c5ff5
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
2016-04-20 16:53:02 +00:00
Felipe Leme
85c63f348f
Listen to INetworkPolicyManager events and update UI accordingly.
...
BUG: 27481520
Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5
2016-04-20 09:17:14 -07:00
Clara Bayarri
b4d55a2050
Remove Secure Startup option from Security Settings
...
Bug: 27440560
Change-Id: Iff700e4e759aea88f8e71f1fdff1837962f84a92
2016-04-20 15:02:44 +01:00
