Commit Graph

27461 Commits

Author SHA1 Message Date
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
b31f7562ff Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev am: dd2797d3ef
am: ac42fbcfec

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

Change-Id: If2efcafb649f105a0ac9f95e7d466c552f3a5149
2016-04-21 18:50:34 +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
9ae9194d28 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 am: 2548717d8b
am: c50b9ea495

* commit 'c50b9ea495c855a8ad0af07b3aa04884af4318d5':

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

* commit 'f1a78a1264c4cc908f79a2259f57848147d512a5':
  Fix summary loader lifecycle

Change-Id: Iec4a09103f6b07f38c8082ae1dee362dd3c4c9e1
2016-04-21 18:34:46 +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
839b4ce52b Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev am: 179103258e
am: 7000aa91b0

* commit '7000aa91b05a65527c95b1e54cdc1665b8d66c3f':
  Add a deletion helper view for clearing space.

Change-Id: I89b59d3955526ecd40dba8464802088bd1daab3f
2016-04-21 17:29:53 +00: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
313673b5b3 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8 am: 8535b31025
am: 35c344afd9

* commit '35c344afd9850f557e644d8ee6a772234e64ad86':

Change-Id: I7a3ad0f615ea770011e25230e7977cc0a5e54870
2016-04-21 17:24:37 +00:00
Yohei Yukawa
3d60b539d3 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8 am: c61d822f6e
am: 06c7b26951

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

Change-Id: I236ece93cfc6a88fb6e7e79a3ea4e2896b82a724
2016-04-21 17:24:35 +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
Andrew Sapperstein
308dda9160 Delete ToastController.
Somehow in cherry-picking and merging back down to master, it got
added back.

Change-Id: I71fbb7f02c258a497119ea16271c26a466d68dea
2016-04-21 10:03:00 -07:00
Daniel Nishi
6bd24811cd Merge "Fix a whitespace issue in ManageApplications." 2016-04-21 16:38:33 +00:00
Jason Monk
9940002a9f Merge "Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64 am: 80f32e1dce" into nyc-mr1-dev-plus-aosp
am: 6f05fd0d25

* commit '6f05fd0d250b1e48af3c48836cb516b2366316ce':

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

* commit '5d8c95d9310abf6339c349c2c97542cc53a7e553':
  Screen saver string fixes

Change-Id: Ie59a721675ecc6f6bf8404136350b058d04caa2c
2016-04-21 16:05:08 +00: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
Keith Cheung
c14c428d33 Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: 43effe8441" into nyc-mr1-dev-plus-aosp
am: 96deee3522

* commit '96deee3522d03bf0b174a226c0f67eca607ae575':

Change-Id: I576648c71c5c32923d5565d987bc27e39df0f484
2016-04-21 15:44:52 +00:00
Keith Cheung
67e7af6e7d Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: 43effe8441" into nyc-mr1-dev-plus-aosp
am: e3f3aef1e1

* commit 'e3f3aef1e13931fd250e5e93cdc151155f474a43':

Change-Id: I4c6a6bd3dda19537b775551459cedbc4379020c8
2016-04-21 15:44:51 +00:00
Keith Cheung
83c4d3f8e6 Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: d932c41831
am: 58d16d50b2

* commit '58d16d50b2b7bef505b32b22d4e22394903d7475':
  Include work app in battery optimization settings

Change-Id: Ia9a5c9a1948f6d489213022644888ec310d17ac9
2016-04-21 15:44:50 +00: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