Commit Graph

26542 Commits

Author SHA1 Message Date
Jason Monk
990ef94b64 Merge "Screen saver string fixes" into nyc-dev 2016-04-21 15:55:27 +00:00
Jason Monk
ac663d2ff5 Screen saver string fixes
Change-Id: I609509787e5f7f9f03eb0e478ab358fe930b0678
Fixes: 28268243
2016-04-21 11:50:58 -04:00
Keith Cheung
d932c41831 Merge "Include work app in battery optimization settings" into nyc-dev
am: 9b167a6878

* commit '9b167a6878d036ffb253687a4eb94e1e44e5fda4':
  Include work app in battery optimization settings

Change-Id: I9998aecbbd7acea6222aa65c6928864b5ea4cd5f
2016-04-21 15:38:02 +00:00
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
ec2516dc0b Merge "Fix only one battery stat showing sometimes." into nyc-dev
am: 7bcc48f77d

* commit '7bcc48f77d1110a14e0cf984431da435ad1b47a5':
  Fix only one battery stat showing sometimes.

Change-Id: Ie7abb1569eee61ce2eb28a73728a60695e481f6e
2016-04-21 14:25:31 +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
9bbeeb708f Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
am: bf0e1338ec

* commit 'bf0e1338ec8ba44b9f03d6c832003ebfa5593d70':
  Fix: Spell checker cannot be re-enabled.

Change-Id: Idaa58d83e77dbcface0f44e8fd83105bae8653e3
2016-04-21 13:59:03 +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
8db5a1313f Merge "Don\'t save a rule without a name." into nyc-dev
am: 257355afde

* commit '257355afde546a408e4f47b59fff97df9d09cf9d':
  Don't save a rule without a name.

Change-Id: I1d05e1f66b8909a8153001b39aa98a625bc1ae75
2016-04-21 12:46:17 +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
a2d94e9973 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am: 25c0b7b

* commit '25c0b7bc4e12d6f0774695ca504118abba81ea88':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I1c7df2c60f898807a3e64fa714db4ff4675835fc
2016-04-20 21:42:23 +00: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
Jason Monk
b5c9e22777 Merge "Add minimum date" into nyc-dev
am: 17b554c

* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
  Add minimum date

Change-Id: I537a109c7f7d2a3ff33f2cf9a9755060b2b6b640
2016-04-20 21:42:21 +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
Felipe Leme
3c62091511 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
am: 4f5568a

* commit '4f5568a8a0cd69968ae0a5278bb06ea8adc9414f':
  Listen to INetworkPolicyManager events and update UI accordingly.

Change-Id: I2aad2e45e53b910efb6b1c684708db0c44ace65a
2016-04-20 21:42:17 +00:00
Jason Monk
5ea44d0add Merge "Fix sim status screen" into nyc-dev
am: e9dffcd

* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
  Fix sim status screen

Change-Id: I56392c9e5319778d31942550497929618ad3338c
2016-04-20 21:42:16 +00:00
Jason Monk
c58b6b7e1a Merge "Fix storage title clearing in multi-window" into nyc-dev
am: 0bea8a9

* commit '0bea8a9f48eabefbd41484ffa19ec21637150a2c':
  Fix storage title clearing in multi-window

Change-Id: Ief2ca68ee3b7563e77091db09eb455c387158b41
2016-04-20 21:42:15 +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
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
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
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
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
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
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
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
Felipe Leme
85c63f348f Listen to INetworkPolicyManager events and update UI accordingly.
BUG: 27481520

Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5
2016-04-20 09:17:14 -07:00
Jason Monk
3f53bdb8a3 Merge "Potential fix for receiver leak problem" into nyc-dev
am: 623a289

* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
  Potential fix for receiver leak problem

Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5
2016-04-20 13:59:42 +00:00
Jason Monk
623a289b9a Merge "Potential fix for receiver leak problem" into nyc-dev 2016-04-20 13:49:32 +00:00