ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
20,872 Commits 2 Branches 0 Tags 54 MiB
055a7926e6
Commit Graph

20872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
055a7926e6 am 0f0541e4: am b88102f5: Input dispatcher ANR handling enhancements. 
Merge commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6'

* commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6':
  Input dispatcher ANR handling enhancements.
 2010-09-12 17:15:19 -07:00
Jeff Brown
0162133795 am b88102f5: Input dispatcher ANR handling enhancements. 
Merge commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1' into gingerbread-plus-aosp

* commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1':
  Input dispatcher ANR handling enhancements.
 2010-09-12 17:05:38 -07:00
Jeff Brown
a665ca805c Input dispatcher ANR handling enhancements. 
This change is essentially a rewrite of the main input dispatcher loop
with the target identification folded in.  Since the input dispatcher now
has all of the window state, it can make better decisions about
when to ANR.

Added a .5 second deadline for processing app switch keys.  This behavior
predates Gingerbread but had not previously been ported.

Fixed some timing inaccuracies in the ANR accounting that could cause
applications to ANR sooner than they should have.

Added a mechanism for tracking key and motion events that have been
dispatched to a window so that appropriate cancelation events can be
synthesized when recovering from ANR.  This change helps to keep
applications in sync so they don't end up with stuck buttons upon
recovery from ANRs.

Added more comments to describe the tricky parts of PollLoop.

Change-Id: I13dffca27acb436fc383980db536abc4d8b9e6f1
 2010-09-12 16:52:03 -07:00
Adam Powell
b7070deffb Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture" 2010-09-12 14:19:46 -07:00
Joe Onorato
209ddbf150 Merge "Connect my plumbing to dsandler's awesome lights out mode." 2010-09-12 14:07:04 -07:00
Romain Guy
7de6490d41 am 7d5c0e66: am 15f0a79a: Merge "fix typo in comment @beamsOverlap" 
Merge commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8'

* commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8':
  fix typo in comment @beamsOverlap
 2010-09-12 14:01:08 -07:00
Brad Fitzpatrick
8d7f08b538 resolved conflicts for merge of 171c83f4 to master 
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
 2010-09-12 13:55:18 -07:00
Adam Powell
c451fecc23 Merge "resolved conflicts for merge of 12e08f3a to master" 2010-09-12 13:14:16 -07:00
Romain Guy
8e97fe4a7f Merge "Optimize calls to glCopyTexImage2D()." 2010-09-12 13:03:42 -07:00
Adam Powell
3e97393b65 resolved conflicts for merge of 12e08f3a to master 
Change-Id: Ic691ec7716d5c450406717d3748847cb9c6b7e82
 2010-09-12 12:47:04 -07:00
Romain Guy
95a5043ed8 Merge "Correct implementation of saveLayer()." 2010-09-12 12:25:13 -07:00
Romain Guy
e27f0c736c am 15f0a79a: Merge "fix typo in comment @beamsOverlap" 
Merge commit '15f0a79a81fd18211603587bcd46eee0e37ced4d' into gingerbread-plus-aosp

* commit '15f0a79a81fd18211603587bcd46eee0e37ced4d':
  fix typo in comment @beamsOverlap
 2010-09-12 12:01:54 -07:00
Romain Guy
b6e06d57e5 Merge "fix typo in comment @beamsOverlap" 2010-09-12 11:42:49 -07:00
Brad Fitzpatrick
06996eb1ec am 11fe181e: Add faster TextUtil function for searching delimited lists. 
Merge commit '11fe181e16501103d7c0f70344661ea2ef5d3df9' into gingerbread-plus-aosp

* commit '11fe181e16501103d7c0f70344661ea2ef5d3df9':
  Add faster TextUtil function for searching delimited lists.
 2010-09-12 11:03:48 -07:00
Adam Powell
2f8d3f0e2a am 26cab064: Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread 
Merge commit '26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp

* commit '26cab06472badee374ac854f5a210991c37c4493':
  Allow two finger pan and scale on touchscreens with
 2010-09-12 10:28:50 -07:00
Adam Powell
f76fc380f5 Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread 2010-09-12 10:25:55 -07:00
Jean-Baptiste Queru
6e2dd9afa6 am ec06144c: am 36edb202: Merge "Make DRM libraries optional" 
Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'

* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
  Make DRM libraries optional
 2010-09-12 08:59:29 -07:00
Jean-Baptiste Queru
aa8831d263 am 36edb202: Merge "Make DRM libraries optional" 
Merge commit '36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp

* commit '36edb2028acf9f876a288a49a66bc749b28e64c1':
  Make DRM libraries optional
 2010-09-12 08:57:07 -07:00
Romain Guy
d2a53ede47 am 405f537a: am 89e05fd5: Merge "Fix the layouting of the checkbox." 
Merge commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108'

* commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108':
  Fix the layouting of the checkbox.
 2010-09-12 08:47:40 -07:00
Romain Guy
6b6f26013e am 89e05fd5: Merge "Fix the layouting of the checkbox." 
Merge commit '89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp

* commit '89e05fd560e3347070a55260b7aaec3db5647442':
  Fix the layouting of the checkbox.
 2010-09-12 08:44:37 -07:00
Jean-Baptiste Queru
10745aabc2 am fe1d52d5: resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp 
Merge commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f'

* commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f':
  Memory leak in TextKeyListener.
 2010-09-12 08:43:53 -07:00
Jean-Baptiste Queru
2e084394ae Merge "Make DRM libraries optional" 2010-09-12 08:42:48 -07:00
Jean-Baptiste Queru
935dc55ef6 resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp 
Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617
 2010-09-12 08:35:04 -07:00
Romain Guy
c3d40e5b94 Merge "Fix the layouting of the checkbox." 2010-09-11 14:06:07 -07:00
Romain Guy
1cca244dfe Merge "Memory leak in TextKeyListener." 2010-09-11 14:03:11 -07:00
Chet Haase
070909e7e6 Merge "Make fragment animations work when fragments go away" 2010-09-10 17:45:03 -07:00
Winson Chung
591df0a7c2 Merge "-> Fixing some layout issues in StackView -> Made the highlight width depend on the screen density" 2010-09-10 17:25:44 -07:00
Jean-Baptiste Queru
52a168bb81 am b387571c: am ca6de93a: Merge "Fix number counter will keep going after window losed focus." 
Merge commit 'b387571c42aa08b5b9aa9833edb94c16a623e535'

* commit 'b387571c42aa08b5b9aa9833edb94c16a623e535':
  Fix number counter will keep going after window losed focus.
 2010-09-10 17:24:34 -07:00
Jean-Baptiste Queru
5b792a2bd8 am ca6de93a: Merge "Fix number counter will keep going after window losed focus." 
Merge commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp

* commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a':
  Fix number counter will keep going after window losed focus.
 2010-09-10 16:39:35 -07:00
Jaikumar Ganesh
1327d52680 am b9871461: am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread 
Merge commit 'b987146123879217a6cdcdfeffdddd917edb22cc'

* commit 'b987146123879217a6cdcdfeffdddd917edb22cc':
  Register ServiceStateChanged to CallManager.
 2010-09-10 16:23:24 -07:00
Jean-Baptiste Queru
e10987abea am 03821dc6: am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 
Merge commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3'

* commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3':
  Allow two SurfaceViews inbetween the app and the wallpaper.
 2010-09-10 16:23:17 -07:00
Jean-Baptiste Queru
265a9717ad am d77b0dfd: am 7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 
Merge commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855'

* commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855':
  Make sure OutOfMemoryError is handled by WallpaperManager
 2010-09-10 16:22:27 -07:00
Jean-Baptiste Queru
d7faa10feb Merge "Fix number counter will keep going after window losed focus." 2010-09-10 16:13:13 -07:00
Brad Fitzpatrick
e376a3f3e5 Merge "Fix build caused by automerger and missing imports in master." 2010-09-10 16:05:13 -07:00
Amith Yamasani
2b635ff7f7 Merge "SearchView API" 2010-09-10 16:01:40 -07:00
Jaikumar Ganesh
ed35c68ca1 am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread 
Merge commit 'e442fb6c9215fc6329522915805a9582ec2c3323' into gingerbread-plus-aosp

* commit 'e442fb6c9215fc6329522915805a9582ec2c3323':
  Register ServiceStateChanged to CallManager.
 2010-09-10 16:01:19 -07:00
Jaikumar Ganesh
8dd3d8442f Merge "Register ServiceStateChanged to CallManager." into gingerbread 2010-09-10 15:54:19 -07:00
Jean-Baptiste Queru
d60e3f4272 am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 
Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp

* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
  Allow two SurfaceViews inbetween the app and the wallpaper.
 2010-09-10 15:47:34 -07:00
Jean-Baptiste Queru
adf78d86d7 am 7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp

* commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
  Make sure OutOfMemoryError is handled by WallpaperManager
 2010-09-10 15:47:27 -07:00
Adam Powell
84daca830e Merge "Allow the theme to affect action bar menus" 2010-09-10 15:43:08 -07:00
Gilles Debunne
f78e050ea1 am ddea348d: am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread 
Merge commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0'

* commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0':
  Changed menu and expandedMenu background color to dark.
 2010-09-10 15:07:33 -07:00
Brad Fitzpatrick
8f2e7d2c76 am 37fc8cc7: am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 
Merge commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd'

* commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd':
  Enable strictmode logging in system_server & add a lock.
 2010-09-10 15:07:20 -07:00
Jesse Wilson
04f0d9da29 am 30f163e4: am 86333015: Merge "Delete AWT from frameworks/base." into gingerbread 
Merge commit '30f163e4d9c4f75c3493200c29f8f333ab3de07b'

* commit '30f163e4d9c4f75c3493200c29f8f333ab3de07b':
  Delete AWT from frameworks/base.
 2010-09-10 15:06:54 -07:00
Joe Onorato
5158363a25 am 38f75b97: (-s ours) am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE 
Merge commit '38f75b97d92508633c69eb6461efd353a61dab96'

* commit '38f75b97d92508633c69eb6461efd353a61dab96':
  This was already deprecated, but not picked up by the tool DO NOT MERGE
 2010-09-10 15:06:40 -07:00
Jean-Michel Trivi
d1bfd5a29e Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-10 15:06:38 -07:00
Nipun Kwatra
2b063a8f85 Merge "Adding hasProfile." 2010-09-10 15:04:17 -07:00
Eric Fischer
a9c0d5051f am e7be8e8f: (-s ours) am b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'e7be8e8f6c3db50df8e755033cd110aabd1143df'

* commit 'e7be8e8f6c3db50df8e755033cd110aabd1143df':
  Import revised translations.  DO NOT MERGE
 2010-09-10 15:02:41 -07:00
Brett Chabot
63b892c806 am 0194eeab: am 4940ff85: Update to new ddmlib-prebuilt api. 
Merge commit '0194eeabfe2cef825f3e91144529be6644ef84c0'

* commit '0194eeabfe2cef825f3e91144529be6644ef84c0':
  Update to new ddmlib-prebuilt api.
 2010-09-10 15:02:01 -07:00
Xavier Ducrohet
f048a4b530 am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used" 
Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b'

* commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b':
  Avoid pre-processing images when they won't be used
 2010-09-10 15:01:56 -07:00
Jean-Baptiste Queru
5f9411a539 am e3dabc4b: am beeb71df: fix build 
Merge commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72'

* commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72':
  fix build
 2010-09-10 15:01:50 -07:00