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
c776852e03
Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde
...
am: b6dfee89f7
* commit 'b6dfee89f71b436b827506272d27218e90d54cd6':
Don't save a rule without a name.
Change-Id: Ie6788c6b81480fdfdb228945bd4f2451bc99b78c
2016-04-21 12:48:31 +00:00
Julia Reynolds
b6dfee89f7
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: If2c2b8d4d97c14df6c68277fed639197535c8ba9
2016-04-21 12:46:43 +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
eb362d24a6
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 25c0b7b
...
am: a2d94e9
* commit 'a2d94e9973a0e3072859d924c55c04225eaa9186':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I4b9f0eb86fafdfc430c1939d51f2d584216d3409
2016-04-20 22:20:38 +00:00
Jim Miller
3e38542502
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: I62d0d25643df925e45e895ad40e2f3ad289a8812
2016-04-20 21:46:04 +00:00
Fan Zhang
9fc57d0eba
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev
...
am: 01f1779
* commit '01f177982d1c38a9b85ddb2c22661a12081256a2':
Display setting and support in a tab layout - DO NOT MERGE
Change-Id: I43cd0b99d98bc7bda0aa751a56a7ac8ec03f28dc
2016-04-20 21:44:14 +00:00
Jason Monk
efb6eb8613
Merge "Add minimum date" into nyc-dev am: 17b554c
...
am: a0a1055
* commit 'a0a1055316a9d721c4439813b15af0b4c92d0e6e':
Add minimum date
Change-Id: I82ebfc3618156b163581ef20cf960c510fadcb16
2016-04-20 21:44:14 +00:00
Ruben Brunk
df317dba47
Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110
...
am: 0db43e4
* commit '0db43e44d04854aec6c3d8902fe7a78b9047816c':
Add settings for altering VR display behavior.
Change-Id: I8c79191c9baf60258543ea5718a647012c720c51
2016-04-20 21:44:13 +00:00
Sudheer Shanka
391878a328
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a
...
am: c80d630
* commit 'c80d6305592052c91a86d68aede04cbd226c4d9e':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: Id96188a427f4ff0d306e4f77e8ee600624cee8fa
2016-04-20 21:44:10 +00:00
TreeHugger Robot
d0ff9d63fa
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am: 4f5568a
...
am: 4d1954f
* commit '4d1954f71faf34f7995702cdd9fb3a5e1342841c':
Listen to INetworkPolicyManager events and update UI accordingly.
Change-Id: I5c7b5c9d937af9da035fbef54eab75b70ef16b8a
2016-04-20 21:44:06 +00:00
Jason Monk
bdbf6e771a
Merge "Fix sim status screen" into nyc-dev am: e9dffcd
...
am: 18bf2fb
* commit '18bf2fbdac097ab078cd3c2b726cc9fc971c9dd9':
Fix sim status screen
Change-Id: I9b33ff21135b1d39938a6cbf34e013045629b429
2016-04-20 21:44:05 +00:00
Jason Monk
6d2afc0cc3
Merge "Fix storage title clearing in multi-window" into nyc-dev am: 0bea8a9
...
am: 018d99c
* commit '018d99cd288622bc4daf37b969e3340441bcb28d':
Fix storage title clearing in multi-window
Change-Id: I0e1f19ca14989df82c65adbb0612dcc97370f27b
2016-04-20 21:44:02 +00:00
Andrew Sapperstein
3c05137c23
Remove ToastController.
...
am: 1d1a269
* commit '1d1a2694e93f5b9d8c6fe01a3be8737ae0034736':
Remove ToastController.
Change-Id: I933a0091c6a16115ea112eb13f2c19592d2c0d6c
2016-04-20 21:44:01 +00:00
Andrew Sapperstein
b0c58aa530
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
...
am: 12344c5
* commit '12344c5ff5be19e9f610df033b2cdf529cd13d76':
Create feature factory interface & initial impl.
Change-Id: I0e4cb8ae5c4ac749b38da306d870be01c1775958
2016-04-20 21:43:58 +00: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
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
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
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
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
a0a1055316
Merge "Add minimum date" into nyc-dev
...
am: 17b554c
* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
Add minimum date
Change-Id: I12809498e61faa81775d7ba97d358db779c0a14b
2016-04-20 20:48:42 +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
* 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
78f7b416c0
Add minimum date
...
Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes: 26346842
2016-04-20 15:44:21 -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
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
Felipe Leme
4d1954f71f
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: Iba51d696311d4ddafb34b0e21341ad63239ab89d
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
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
18bf2fbdac
Merge "Fix sim status screen" into nyc-dev
...
am: e9dffcd
* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
Fix sim status screen
Change-Id: Iba80d84350dbff891e3069b04e5f585b10f50491
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
* commit '0bea8a9f48eabefbd41484ffa19ec21637150a2c':
Fix storage title clearing in multi-window
Change-Id: Ic0063a2c0c4b705001ec9de42dc9054794e0d6f4
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