Commit Graph

27086 Commits

Author SHA1 Message Date
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
c50b9ea495 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
am: 2548717d8b

* commit '2548717d8b7610081950a83d497c0236dcf2f0c8':

Change-Id: I5156a325c12f514bc680e56158d1f12402fa4fd0
2016-04-21 18:32:53 +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
Yohei Yukawa
35c344afd9 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8
am: 8535b31025

* commit '8535b31025acb952fefabb26812d9e0cc82267b5':

Change-Id: Ifc5c46addbe058845b0e717f45fe4c91cc443783
2016-04-21 17:22: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
Android Build Merger (Role)
6f05fd0d25 Merge "Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64 am: 80f32e1dce" into nyc-mr1-dev-plus-aosp 2016-04-21 16:00:35 +00:00
Jason Monk
8b20e4d127 Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64
am: 80f32e1dce

* commit '80f32e1dce8015d29fe920acb13e40dcf8518693':
  Screen saver string fixes

Change-Id: Ia9be0152b34a91c7173db5ff78138278d2085aa7
2016-04-21 16:00:27 +00:00
Jason Monk
5d8c95d931 Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64
am: fcc592c6ac

* commit 'fcc592c6ac60402642ebebc7317ecf28293a0f7a':
  Screen saver string fixes

Change-Id: I83b1657abcce0ed9cc685f36bbd95eab4bb390ba
2016-04-21 16:00:25 +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
80f32e1dce Merge "Screen saver string fixes" into nyc-dev
am: 990ef94b64

* commit '990ef94b646f6d38fa8a44ee26f211014969e08e':
  Screen saver string fixes

Change-Id: Ie86b8e3c7478f8f7013ed3c61eaee5d9d6c500b2
2016-04-21 15:58:00 +00:00
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
Android Build Merger (Role)
96deee3522 Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: 43effe8441" into nyc-mr1-dev-plus-aosp 2016-04-21 15:43:25 +00:00
Keith Cheung
f808ffa346 Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878
am: 43effe8441

* commit '43effe8441027d92f73616aade1926ecc1a50d28':

Change-Id: Iace769b2bcd6611a4293f8afc6f220b98b07eeb8
2016-04-21 15:43:18 +00:00
Android Build Merger (Role)
e3f3aef1e1 Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: 43effe8441" into nyc-mr1-dev-plus-aosp 2016-04-21 15:42:41 +00:00
Keith Cheung
83ef16a332 Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878
am: 43effe8441

* commit '43effe8441027d92f73616aade1926ecc1a50d28':
  Include work app in battery optimization settings

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

* commit 'ec2516dc0b05e5d1bac0a7b0c6252623bdcb3def':

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

* commit '9bbeeb708ffd3216d851d5fce76e3b05e7a0e27b':

Change-Id: I5549fdcdc28338a9053a10e5ced279f76674b240
2016-04-21 14:01:25 +00: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
Android Build Merger (Role)
e676f18650 Merge "Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde am: 8db5a1313f" into nyc-mr1-dev-plus-aosp 2016-04-21 12:48:47 +00:00
Julia Reynolds
08fccc5cdd Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde
am: 8db5a1313f

* commit '8db5a1313feb404295713a1f19758bb8eaaea721':
  Don't save a rule without a name.

Change-Id: I6014fc170e8b227fba9dca41a78a7a1c260029ec
2016-04-21 12:48:40 +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