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

125781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
759067f39a Merge "Rename DisplayList->RenderNode" 2014-03-15 00:25:34 +00:00
Tim Kilbourn
5dac28f59d am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 
* commit 'c2b8df82d701eb3508da06f75b2201c3f9796373':
  FEATURE_LEANBACK implies that the device is a tv.
 2014-03-15 00:24:44 +00:00
Marco Nelissen
bc3e4e7a4a am 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '77a00cfe4b29f180b6f5ed65eddc96422453e191':
  Verify certificates
 2014-03-15 00:24:40 +00:00
Daniel 2 Olofsson
bb54eac7c9 am f1b1855a: am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit 'f1b1855acc623f6137f1d51810948a8149b2a9e8':
  Re-initialize error after attach
 2014-03-15 00:18:09 +00:00
Ruben Brunk
38900b1554 Merge "hal3: Add availableHotPixelModes, update modes." 2014-03-15 00:14:56 +00:00
John Reck
ef09d8cf94 Rename DisplayList->RenderNode 
Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
 2014-03-14 17:14:16 -07:00
Craig Mautner
821df858fc am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge 
* commit '5b98618f2471cbea8466ec5a4dea0a819a7c0f3c':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-14 23:57:24 +00:00
Craig Mautner
5b98618f24 am ca0aba39: Merge commit \'54d5702c\' into manualmerge 
* commit 'ca0aba399326886d1a39c2344bab296044ba5eb0':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-14 23:54:46 +00:00
Winson Chung
04dfe0d26b Simplifying memory management, use Task Keys as resource cache keys. 
- Attempts to load non-topmost task thumbnails from cache
- Ensuring that we release all references to the activity from the bg loader
- Removes background loading debug flag
- Moving callbacks into their respective classes
- cleaning up some callbacks when data is loaded in the bg

Change-Id: Ibb968349d08084922d5b28e432b76a165bf20d6b
 2014-03-14 16:53:45 -07:00
Craig Mautner
ca0aba3993 Merge commit '54d5702c' into manualmerge 
Conflicts:
	services/core/java/com/android/server/am/TaskRecord.java

Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe
 2014-03-14 16:49:50 -07:00
Tim Kilbourn
c2b8df82d7 am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 
* commit '42dd0bb6b506be81c76cffc7b6f5491c937d4e07':
  FEATURE_LEANBACK implies that the device is a tv.
 2014-03-14 23:37:55 +00:00
Marco Nelissen
77a00cfe4b am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '30260c7e93fa5d5a08c505e1b804849bb56b83f1':
  Verify certificates
 2014-03-14 23:37:52 +00:00
Daniel 2 Olofsson
f1b1855acc am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit '18306520d8afc168df78024d139ed189d8ff7cdb':
  Re-initialize error after attach
 2014-03-14 23:37:49 +00:00
Selim Cinek
defe4b3fdb am 93d279f5: (-s ours) am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '93d279f562e0fa41be11c25e16df483fd8093b88':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 23:33:15 +00:00
Tim Kilbourn
42dd0bb6b5 am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 
* commit '9539b4a02f74b447db0e3aa1039229f6b913aa87':
  FEATURE_LEANBACK implies that the device is a tv.
 2014-03-14 23:33:11 +00:00
Marco Nelissen
30260c7e93 am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '203a6ddb0c098821ff36511e2a98211a90a69954':
  Verify certificates
 2014-03-14 23:33:02 +00:00
Daniel 2 Olofsson
18306520d8 am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit '39fc43b0f91e8d92fc4251e11384c4ea6544cf35':
  Re-initialize error after attach
 2014-03-14 23:33:00 +00:00
Craig Mautner
f8e4b61cef Merge commit '17586ce7' into manualmerge 
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I4dedf1dc80e224c47cbc020836ad408b641c1d76
 2014-03-14 16:31:07 -07:00
Craig Mautner
a002fab7c7 Merge "Show the keyguard if unsecure window on top" 2014-03-14 23:24:54 +00:00
Craig Mautner
da09ae385a Show the keyguard if unsecure window on top 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

(cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-14 16:20:00 -07:00
Tim Kilbourn
9539b4a02f Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 2014-03-14 23:13:45 +00:00
Marco Nelissen
203a6ddb0c am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '105c47924f7af9319ec9242b952b4bf074585229':
  Verify certificates
 2014-03-14 22:55:50 +00:00
Daniel 2 Olofsson
39fc43b0f9 am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit '4111e7e17665b1142853c71e9fd1cf6af5f68b82':
  Re-initialize error after attach
 2014-03-14 22:55:45 +00:00
Craig Mautner
54d5702cf8 am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev 
* commit '477897ad7b0725fa68d32a94bf8c24264068fd5c':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-14 22:36:15 +00:00
Marco Nelissen
105c47924f am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '10a07a043f7fa47148ae2cc2fcd6b0edeb52190b':
  Verify certificates
 2014-03-14 22:32:02 +00:00
Craig Mautner
477897ad7b Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev 2014-03-14 22:30:04 +00:00
Craig Mautner
fdf28cc4be Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE. 
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.

Fixes bug 12171535.

Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
 2014-03-14 22:28:07 +00:00
Daniel 2 Olofsson
4111e7e176 am 09421fab: Re-initialize error after attach 
* commit '09421fab0784bcfc6660a09d02faea7835c28e31':
  Re-initialize error after attach
 2014-03-14 22:27:52 +00:00
Marco Nelissen
10a07a043f Merge "Verify certificates" into klp-dev 2014-03-14 22:27:23 +00:00
Yohei Yukawa
8959ad36c4 am 43bfed54: (-s ours) am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit '43bfed5430f8c0b042ad229370a9d1fe95eb6156':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 22:23:05 +00:00
Craig Mautner
e5aefea0d7 am ce805c7c: am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit 'ce805c7ce475eead0e4e3326070d7dc2983d4e70':
  Fix activities appearing behind launcher icons
 2014-03-14 22:23:02 +00:00
Selim Cinek
93d279f562 am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '1470883e0716af4e3f4014e2ef427aae67286fc8':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 22:03:09 +00:00
Craig Mautner
17586ce7a6 am 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit '5df673d915ef9c9d4466ff1a7eeaf62f908c7aff':
  Show the keyguard if unsecure window on top
 2014-03-14 22:03:06 +00:00
Yohei Yukawa
43bfed5430 am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit 'c05362b84cd55f6bac20a373b74f66a79577109d':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 22:03:03 +00:00
Craig Mautner
ce805c7ce4 am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit '8a6ab82114058eedc6aeb29902f0f3926a33a0c6':
  Fix activities appearing behind launcher icons
 2014-03-14 22:03:00 +00:00
Selim Cinek
1470883e07 am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '149fd6d84d53c7f509418048b931ff2c45e8deb4':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 21:59:42 +00:00
Craig Mautner
5df673d915 am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit 'f6f0946addc5230634ac2a09115097531dc6094b':
  Show the keyguard if unsecure window on top
 2014-03-14 21:59:39 +00:00
Yohei Yukawa
c05362b84c am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit '77943308f5661636d85cb5e78188dbbc8f0e329e':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 21:59:35 +00:00
Craig Mautner
8a6ab82114 am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit 'c6103803cb24dafd2cb056dbac040a046b7ed12d':
  Fix activities appearing behind launcher icons
 2014-03-14 21:59:33 +00:00
Selim Cinek
149fd6d84d am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 21:55:05 +00:00
Craig Mautner
f6f0946add am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2':
  Show the keyguard if unsecure window on top
 2014-03-14 21:54:52 +00:00
Yohei Yukawa
77943308f5 am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 21:54:49 +00:00
Craig Mautner
c6103803cb am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit 'a921d8b6b1a3478f258b9999ed909907216edbae':
  Fix activities appearing behind launcher icons
 2014-03-14 21:54:45 +00:00
Mike Lockwood
9428eb82c0 am c5353ce3: am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit 'c5353ce373f02b549ed9e63aa23f94ca1a726f7e':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:54:13 +00:00
Mike Lockwood
c5353ce373 am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit '685831bf8da4f89366ce16c1852f25efad046261':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:50:44 +00:00
Daniel 2 Olofsson
09421fab07 Re-initialize error after attach 
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.

Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
 2014-03-14 14:49:23 -07:00
Mike Lockwood
685831bf8d am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit 'f9b90434ef04b509c7dcb868d50aa53a66b97809':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:47:37 +00:00
Craig Mautner
421a1dd197 Merge "Launch new tasks with Doc Centric flag." 2014-03-14 21:43:28 +00:00
Mike Lockwood
f9b90434ef am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit 'ff64f5ed7c2b55878d149d546092e029cba15465':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:42:58 +00:00
Craig Mautner
d00f47402c Launch new tasks with Doc Centric flag. 
Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.

Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
 2014-03-14 14:42:23 -07:00