Commit Graph

11919 Commits

Author SHA1 Message Date
Amit Mahajan
afdcb6a78e Merge "Fix ApnSettings crash issue." into nyc-dev 2016-04-21 19:41:13 +00:00
yifan.bai
27b908f6d1 Fix ApnSettings crash issue.
Steps:
1. Add a new APN;
2. Click 'Reset to default';
3. During reset, click the new APN;
4. Crash happened.
Solution:
Disable menu items when reseting default APN.

Bug: 28314239
Change-Id: I8df439d066e58039e9f91a9be642127eb7298159
2016-04-21 19:23:25 +00:00
Robin Lee
04c7dc2424 Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
am: 4a588faeb8

* commit '4a588faeb8597fcfe49e1eac90307fb3fbdab244':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I398e1c8ee75c0cec6a569cc469996a5867d8975c
2016-04-21 19:20:05 +00:00
Robin Lee
4a588faeb8 Merge changes Ibac27ee1,I336aeefd into nyc-dev
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I5d447989c9a149314bf0fcde0e4f1f77b868f40e
2016-04-21 19:17:51 +00:00
Robin Lee
69f12b6e6f Merge changes Ibac27ee1,I336aeefd into nyc-dev
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I93ffd1d56ca9ff4d8e9c8e16fc897e2368ae1260
2016-04-21 19:17:50 +00:00
Robin Lee
e2ae135d3c Merge changes Ibac27ee1,I336aeefd into nyc-dev
* changes:
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs
2016-04-21 19:13:49 +00:00
Fan Zhang
ac42fbcfec Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev
am: dd2797d3ef

* commit 'dd2797d3eff2ab2bb0b42efba4319c6a1249a4c4':
  Open Help forum in browser when click 'Forum' button.

Change-Id: I287fe83878876329eb95a2384c5e47b3f55635bc
2016-04-21 18:48:16 +00:00
Jason Monk
f1a78a1264 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
am: 2424d1dc04

* commit '2424d1dc043ce0f7113bd789f2701beb8484c9b5':
  Fix summary loader lifecycle

Change-Id: Idb8e0530c02389ca097131ed95467042ebe0135c
2016-04-21 18:30:40 +00:00
Fan Zhang
dd2797d3ef Merge "Open Help forum in browser when click 'Forum' button." into nyc-mr1-dev 2016-04-21 18:28:46 +00:00
Jason Monk
2548717d8b Merge "Fix summary loader lifecycle" into nyc-dev
am: 1624f69ac9

* commit '1624f69ac92d1358a2401125033be5c83025a140':
  Fix summary loader lifecycle

Change-Id: Icb1deb9de59dbb7cc3cf6cea80fb8e11445c20a3
2016-04-21 18:28:21 +00:00
Jason Monk
2424d1dc04 Merge "Fix summary loader lifecycle" into nyc-dev
am: 1624f69ac9

* commit '1624f69ac92d1358a2401125033be5c83025a140':
  Fix summary loader lifecycle

Change-Id: Ib6e0e9de81d9b57e180825b8992ef08327fec9b1
2016-04-21 18:28:19 +00:00
Jason Monk
1624f69ac9 Merge "Fix summary loader lifecycle" into nyc-dev 2016-04-21 18:20:08 +00:00
Jason Monk
0842797a25 Fix summary loader lifecycle
Previous CL accidentally cleared the listening bit too early making
it never actually tell the SummaryProviders to stop listening.

Change-Id: I6af1acc861f6987b33641c40637354c75cf4d708
Fixes: 28306872
2016-04-21 14:15:13 -04:00
Daniel Nishi
7000aa91b0 Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev
am: 179103258e

* commit '179103258e4e664fbdd76b8440aff3edae86b093':
  Add a deletion helper view for clearing space.

Change-Id: If02b00b3e35e717508ae69894a36ac71a1c3c30f
2016-04-21 17:27:16 +00:00
Daniel Nishi
179103258e Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev 2016-04-21 17:22:11 +00:00
Daniel Nishi
b84304d4e6 Add a deletion helper view for clearing space.
This view provides an interface which allows users to clear out
apps and other data which they may no longer need to alleviate
storage pressure. This implementation gives the bits to uninstall
apps which have not been used within the last 60 days from the
system.

A future patch will add in the ability to extend the deletion helper
view to have additional clearing types.

Change-Id: I65cba54ca247d52227e67e2fa9b84fe63fb8ab34
(cherry picked from commit a671272bf6)
2016-04-21 10:20:58 -07:00
Yohei Yukawa
06c7b26951 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8
am: c61d822f6e

* commit 'c61d822f6e781255ad850a0d2eaedfdef6335346':
  Support IMEs that have no subtype in PhysicalKeyboardFragment.

Change-Id: I31da307279147ae6c48cbe8bae97b71ad9774ea0
2016-04-21 17:20:33 +00:00
Yohei Yukawa
c61d822f6e Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
am: b156761ae8

* commit 'b156761ae88d63e982bdaae413fe102fc4042c3a':
  Support IMEs that have no subtype in PhysicalKeyboardFragment.

Change-Id: I99ee1f03a52d650186070c572641fa84091e21b5
2016-04-21 17:18:20 +00:00
Yohei Yukawa
8535b31025 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
am: b156761ae8

* commit 'b156761ae88d63e982bdaae413fe102fc4042c3a':
  Support IMEs that have no subtype in PhysicalKeyboardFragment.

Change-Id: If0b8c97e6a0cad08c2a94039d3543be8fef3260a
2016-04-21 17:18:19 +00:00
Yohei Yukawa
b156761ae8 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev 2016-04-21 17:11:53 +00:00
Robin Lee
b166ea2668 Be more aggressive caching Vpn preference attrs
As any change to the preference title will cause it to lose focus,
best not to do this too often.

Change-Id: Ibac27ee1de42fd7ca05f3e3685b84f37dac39517
Fix: 28191965
2016-04-21 18:04:42 +01:00
Keith Cheung
58d16d50b2 Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878
am: d932c41831

* commit 'd932c4183194c1d664a07a440f20c467a8d1189a':
  Include work app in battery optimization settings

Change-Id: I2e8d185c2b650ca8d89d47ae9260aa758ba8c7fd
2016-04-21 15:42:30 +00:00
Keith Cheung
43effe8441 Merge "Include work app in battery optimization settings" into nyc-dev
am: 9b167a6878

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

Change-Id: I61f2d84f5f57234a2dbb7a5ef4059b5e63fdfdda
2016-04-21 15:38:30 +00: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
Fan Zhang
35e21cf630 Open Help forum in browser when click 'Forum' button.
Bug: 28301478
Change-Id: I0dad851089aa3061513b65b79d8b31da9ba8767a
2016-04-21 08:27:37 -07: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
763f5c4411 Merge "Fix only one battery stat showing sometimes." into nyc-dev am: 7bcc48f77d
am: a2f7a5980e

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

Change-Id: I1613068ba88096d78a3894d19135e591f034a191
2016-04-21 14:27:44 +00:00
Jason Monk
a2f7a5980e Merge "Fix only one battery stat showing sometimes." into nyc-dev
am: 7bcc48f77d

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

Change-Id: I70aac29590b8b65bd904a07f441f467cb7041930
2016-04-21 14:26:01 +00: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
2aa8800f46 Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am: bf0e1338ec
am: 172829299a

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

Change-Id: Ide8c8050138f0fa223815661cbec5f9545d7db66
2016-04-21 14:01:14 +00:00
Keisuke Kuroyanagi
172829299a Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
am: bf0e1338ec

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

Change-Id: I69ff82d861702714af39c51bc199560c5d124112
2016-04-21 13:59:32 +00: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
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