drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,430 Commits 1 Branch 0 Tags
Commit Graph

15059 Commits

Author SHA1 Message Date
Alan Viverette
516f953a82 resolved conflicts for merge of e4ccb864 to master 
Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22
 2013-10-07 18:05:09 -07:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:54:42 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00
Craig Mautner
4964584d39 am 4a38b0ab: am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev 
* commit '4a38b0ab92b565547777df6959516325058f73d0':
  Yet more debugging for 10858941.
 2013-10-07 17:23:35 -07:00
Craig Mautner
4a38b0ab92 am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev 
* commit '972a985590266e457d4a13400dfb5797d7b85908':
  Yet more debugging for 10858941.
 2013-10-07 17:21:41 -07:00
Craig Mautner
b729e99578 Merge "Yet more debugging for 10858941." into klp-dev 2013-10-08 00:16:41 +00:00
Craig Mautner
e2dd83a5b4 Yet more debugging for 10858941. 
Change-Id: I258957044cb1a8331124f6abbe53428429c33355
 2013-10-07 17:01:41 -07:00
Dianne Hackborn
ab0330f226 am 713cc5bf: am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit '713cc5bf74204e4c43429724ecc929c205c18995':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:40:07 -07:00
Dianne Hackborn
713cc5bf74 am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit 'fcdbc82ba32b7ef1c8fbd12944b4aaed70019fb1':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:36:46 -07:00
Dianne Hackborn
cade4089e7 Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 2013-10-07 22:30:34 +00:00
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:16:14 -07:00
Alan Viverette
5a0f4eccfb Ignore certain WindowManager flags when touch exploration is enabled 
Specifically, ignore any flags that alter the visibility of the navigation
bar and transparency.

BUG: 11082573
Change-Id: I17264dc55a1c6c3cb9b9cf92d5121799cecee5b8
 2013-10-07 15:12:57 -07:00
Jeff Sharkey
9d1383c61c am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:12:16 -07:00
Jeff Sharkey
bcc77b502b Merge "Add <intent-filter> support to <provider>." into klp-dev 2013-10-07 21:41:45 +00:00
Dianne Hackborn
13c590de1e Fix issue #11113111: dumpsys activity service is broken 
Change-Id: Ie02d27b377c562085ef7eb5dea144ce2f382c11d
 2013-10-07 14:36:47 -07:00
Jeff Sharkey
85f5f81320 Add <intent-filter> support to <provider>. 
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
 2013-10-07 14:19:13 -07:00
Craig Mautner
994f407cc1 am d99f9854: am 6b027cc7: am e7dd3469: Merge "Relax conditions for including windows behind dialogs" into klp-dev 
* commit 'd99f9854e21b15af2ea9226d35c3662e3c542ce8':
  Relax conditions for including windows behind dialogs
 2013-10-06 18:24:20 -07:00
Craig Mautner
1f29fc18fb am 1a205e9a: am 846a482a: am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev 
* commit '1a205e9a0c2587ec603d88e954bd89ca0c957e7a':
  Revert to jb-mr2 handling of app died.
 2013-10-06 18:24:17 -07:00
Christopher Tate
20e85d252c am 12c0b66f: am a5c43674: am eb09f990: Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev 
* commit '12c0b66fcecee7671a2cf3e28fddfb9cfa0c679d':
  Make sure to maintain privilege when downgrading bundled apps
 2013-10-06 18:24:13 -07:00
Dianne Hackborn
91b5ab00d1 am c9d48121: am 7ac5a9ac: am 4bc5909a: Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev 
* commit 'c9d481218b23ff72922ddc6bbc006be971ff252f':
  Fix issue #11050678: Large memory leak in ActivityStack
 2013-10-06 18:24:06 -07:00
Dianne Hackborn
a74bbf0694 am 0fa2673e: am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev 
* commit '0fa2673e9b9ccabdaa1837b5e6ec0b91c75d1a89':
  Fix issue #11086275: Thumbnail only created once for top activity
 2013-10-06 18:24:02 -07:00
Craig Mautner
46d0aab6a1 am 6ebd6cb6: am c50738d6: am dd88879c: Merge "Evaluate task on top of home when task is brought to front." into klp-dev 
* commit '6ebd6cb673f5c3e432c1e92d6aec7ce47ecdd2cf':
  Evaluate task on top of home when task is brought to front.
 2013-10-06 18:23:53 -07:00
Craig Mautner
02a4e7330f am 2478281d: am 3cb25e91: am 1703fd87: Merge "Resume user where they left off." into klp-dev 
* commit '2478281de362c86825cd93d6395af4197d1adb73':
  Resume user where they left off.
 2013-10-06 18:23:49 -07:00
Christopher Tate
b2bb7ddebe am 2aa93138: am e67ebcbc: am 4b4ad011: Merge "Notify that ASEC containers are being unmounted during upgrades" into klp-dev 
* commit '2aa931380b759ec45602dd560aa4d4170ea93330':
  Notify that ASEC containers are being unmounted during upgrades
 2013-10-06 18:23:45 -07:00
Craig Mautner
d99f9854e2 am 6b027cc7: am e7dd3469: Merge "Relax conditions for including windows behind dialogs" into klp-dev 
* commit '6b027cc713659bbe2127c83fe8bc14e66a163727':
  Relax conditions for including windows behind dialogs
 2013-10-06 18:19:06 -07:00
Craig Mautner
1a205e9a0c am 846a482a: am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev 
* commit '846a482a0d891a799bfd6e9b00ed5b401a791b30':
  Revert to jb-mr2 handling of app died.
 2013-10-06 18:19:03 -07:00
Christopher Tate
12c0b66fce am a5c43674: am eb09f990: Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev 
* commit 'a5c436743c2d0343550d13f16ae557d4ea6101e1':
  Make sure to maintain privilege when downgrading bundled apps
 2013-10-06 18:19:01 -07:00
Dianne Hackborn
c9d481218b am 7ac5a9ac: am 4bc5909a: Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev 
* commit '7ac5a9acb8c110620eac04db1eabecbbf64c0744':
  Fix issue #11050678: Large memory leak in ActivityStack
 2013-10-06 18:18:58 -07:00
Dianne Hackborn
0fa2673e9b am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev 
* commit 'ae828e869f1cc7506bc0d9329007c6fb990de39f':
  Fix issue #11086275: Thumbnail only created once for top activity
 2013-10-06 18:18:55 -07:00
Craig Mautner
6ebd6cb673 am c50738d6: am dd88879c: Merge "Evaluate task on top of home when task is brought to front." into klp-dev 
* commit 'c50738d67d92ce97f986b5f9371faf5a1a5e9f79':
  Evaluate task on top of home when task is brought to front.
 2013-10-06 18:18:49 -07:00
Craig Mautner
2478281de3 am 3cb25e91: am 1703fd87: Merge "Resume user where they left off." into klp-dev 
* commit '3cb25e91b419d4f18fec8ea2ceec33eb0915096a':
  Resume user where they left off.
 2013-10-06 18:18:46 -07:00
Christopher Tate
2aa931380b am e67ebcbc: am 4b4ad011: Merge "Notify that ASEC containers are being unmounted during upgrades" into klp-dev 
* commit 'e67ebcbc0c5f03434aa756449f0cea6ecb1fde5b':
  Notify that ASEC containers are being unmounted during upgrades
 2013-10-06 18:18:44 -07:00
Craig Mautner
e7dd3469ff Merge "Relax conditions for including windows behind dialogs" into klp-dev 2013-10-06 21:29:34 +00:00
Craig Mautner
ade5f387fa Merge "Revert to jb-mr2 handling of app died." into klp-dev 2013-10-06 21:29:05 +00:00
Christopher Tate
eb09f99038 Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev 2013-10-06 21:26:19 +00:00
Dianne Hackborn
4bc5909a03 Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev 2013-10-06 20:28:47 +00:00
Dianne Hackborn
f46bb1d99b Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev 2013-10-06 20:28:07 +00:00
Craig Mautner
ff174d52bd Relax conditions for including windows behind dialogs 
When a dialog has been minimized to recents the windows behind it
won't be visible. Yet we were requiring them to be visible in order to
be included in the ones being restored. This left the background
windows invisible on resume and showed home behind floating dialogs
instead of the activity that launched the dialogs.

Fixes bug 11067724.

Change-Id: Icadd7ec8fe7c73b52982b6ff5b5d98b8fb8476b0
 2013-10-06 12:24:56 -07:00
Craig Mautner
dd88879ce1 Merge "Evaluate task on top of home when task is brought to front." into klp-dev 2013-10-06 17:44:38 +00:00
Craig Mautner
1703fd877f Merge "Resume user where they left off." into klp-dev 2013-10-06 17:44:18 +00:00
Craig Mautner
1909125eba Revert to jb-mr2 handling of app died. 
Trying to span all potential stacks looking for apps was too complex
and error-prone. Extending the jb-mr2 method across multiple stacks.

Fixes bug 11080696.

Change-Id: I6391ceae4ad6a0955a409c3fb27472219fd5bf6b
 2013-10-06 10:39:31 -07:00
Christopher Tate
4b4ad01158 Merge "Notify that ASEC containers are being unmounted during upgrades" into klp-dev 2013-10-06 17:23:16 +00:00
Christopher Tate
0fe85a9492 Make sure to maintain privilege when downgrading bundled apps 
When reparsing because the data-volume update has been removed, be sure
to apply privilege when the bundled fallback APK should be allowed it.

Bug 10958159

Change-Id: Ibad52a5644606b27f4ebc5d5d7c1a671283b0752
 2013-10-06 10:18:06 -07:00
Dianne Hackborn
4d03fe6420 Fix issue #11086275: Thumbnail only created once for top activity 
If the last screenshot activity is resumed, we need to always capture
a new screenshot, because it can change at any time.

On the other hand, never create a thumbnail for tasks that have set
themselves to not show on the recent tasks lists, since we have no
use for them.

Change-Id: I38523afc966c125da93339e0100da950119cdf99
 2013-10-05 10:26:23 -07:00
Craig Mautner
93529a475e Resume user where they left off. 
Remember which stack was in front when the user changes. Restore that
stack when the user changes back. Remove user state when user is
deleted.

Fixes bug 11068986.

Change-Id: I18dfbc35a0c2e21e7a4024227cbfc5ba1208b3a3
 2013-10-04 20:55:39 -07:00
Craig Mautner
9c85c201a2 Evaluate task on top of home when task is brought to front. 
Localize the point where it is determined whether a task should sit on
top of home or return to the task below it.

Fixes bug 11080913.

Change-Id: I79d1ea9722c867d6b550ddfcd1db35517a79cd90
 2013-10-04 20:11:26 -07:00
Christopher Tate
d159674890 Notify that ASEC containers are being unmounted during upgrades 
When an apk is installed on ordinary unmountable media, a broadcast
is sent when the OS wants to unmount it so that interested parties
can cleanly close any files they have open to read that apk's
resources or similar.  We now send that broadcast when we are
about to unmount the ASEC fs container that holds a forward-locked
apk as well, so that e.g. Home knows to release the resources that
it was using for widget hosting or similar.

Bug 7703848

Change-Id: I71aefdb4086c7b73a128f89c15d192a2b92d09a8
 2013-10-04 18:05:39 -07:00
Svetoslav
6754f68f49 am 133c1faf: am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev 
* commit '133c1faf8c4450c5ad45dea13323d45dfb60817b':
  Small print API tweaks
 2013-10-04 17:37:21 -07:00
Svetoslav
133c1faf8c am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev 
* commit '67d7af514c2a393cbe886ebf5527a0dc45817cfb':
  Small print API tweaks
 2013-10-04 16:51:58 -07:00
Svetoslav
19565ad1a1 Merge "Small print API tweaks" into klp-dev 2013-10-04 23:48:37 +00:00