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

43448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
635c044e7d am 2c552372: am 8c0ac870: Merge "Fix another part of #3387855: Menu flashes on left side of screen" into honeycomb 
* commit '2c552372ceff3025dfae6f0d2cc91b7d103970fd':
  Fix another part of #3387855: Menu flashes on left side of screen
 2011-01-26 19:07:57 -08:00
Dianne Hackborn
831a010aec am 5640392f: am 2d63144e: Merge "Fix issue #3380072: Switching in and out of gmail not preserving position in label" into honeycomb 
* commit '5640392f584c64f048180ac75218b5c7f9281b76':
  Fix issue #3380072: Switching in and out of gmail not preserving position in label
 2011-01-26 19:07:46 -08:00
Mike Lockwood
0abd82f099 am ba492eb6: am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb 
* commit 'ba492eb636a45cd5686fb0e6eb807e3deaa500fb':
  Fix javadoc for MediaStore.Files.FileColumns constants
 2011-01-26 19:07:34 -08:00
Winson Chung
93781b613b am ab4ea688: am b90a91c6: Making requested indices the last to be pruned when we hit cache memory limits. (3368863) 
* commit 'ab4ea688694a3de4580d341a568e523902731855':
  Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
 2011-01-26 19:07:13 -08:00
Andreas Huber
edbf4b3b21 am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb 
* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
  This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 19:06:43 -08:00
Jim Miller
3c70c3bad1 am eaa738ef: am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb 
* commit 'eaa738efac8cb34d57ca6c0aea4c95586b0d9fd4':
  Fix 3354590: Add back button to dismiss RecentAppsPanel
 2011-01-26 19:06:30 -08:00
Dianne Hackborn
2dc9c784b2 Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb 2011-01-26 19:04:15 -08:00
Jim Miller
8996cf071a Fix 3381324: Restart ripples when the user moves away from the edge. 
This changes the behavior of WaveView to start waves again when
the user moves the halo back towards the center.

Change-Id: Ia3b8fbd091e90e83e0c34b98a3060d3236191d7a
 2011-01-26 19:03:49 -08:00
Dianne Hackborn
63042d6a03 Fix issue #3382992: IME close animation stutters from URL bar 
Gross hack is grosser.

Change-Id: I0a34bf1d7c16c547402318f24776a5f7e8b7552b
 2011-01-26 18:56:29 -08:00
Scott Main
796f1af045 Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-26 18:48:22 -08:00
Romain Guy
0d8f88b272 am ede54ce2: Merge "Fix crash in movie studio." into honeycomb 
* commit 'ede54ce2fe3252d4ab56b90de464b35a6920970d':
  Fix crash in movie studio.
 2011-01-26 18:47:59 -08:00
Scott Main
2518895c50 resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp 
Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab
 2011-01-26 18:47:13 -08:00
Romain Guy
ede54ce2fe Merge "Fix crash in movie studio." into honeycomb 2011-01-26 18:46:29 -08:00
Romain Guy
0c75622cf8 Fix crash in movie studio. 
Change-Id: I06acb0b39cc3839cf7abb58b32dec9b9bec424d6
 2011-01-26 18:48:38 -08:00
Scott Main
77ba255e32 am ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs 
* commit 'ba3dd32357b47ab0b55a1976bbafc225df78a59d':
  enable preview mode for docs and add api level 10 flag for api level diffs
 2011-01-26 18:37:22 -08:00
Romain Guy
0518e7b5bd am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487" into honeycomb 
* commit '9c8307fb19558ffe2e897bad009fb038bb9e845b':
  Make sure that we update SurfaceView's window with display lists. Bug #3395487
 2011-01-26 18:32:54 -08:00
Romain Guy
f2499fa434 Make sure that we update SurfaceView's window with display lists. 
Bug #3395487

Change-Id: Idaef3953a596ee3b4049a2d8aef6dda676b1545b
 2011-01-26 18:31:23 -08:00
Scott Main
ba3dd32357 enable preview mode for docs and add api level 10 flag for api level diffs 
Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc
 2011-01-26 18:29:50 -08:00
Romain Guy
9c8307fb19 Merge "Make sure that we update SurfaceView's window with display lists. Bug #3395487" into honeycomb 2011-01-26 18:29:38 -08:00
Daniel Sandler
0517ea2ab8 am da597b5c: Merge "Status bar visual tweaks." into honeycomb 
* commit 'da597b5c1a6553a43f1e938ef87b29c8f2a59386':
  Status bar visual tweaks.
 2011-01-26 18:19:19 -08:00
Daniel Sandler
da597b5c1a Merge "Status bar visual tweaks." into honeycomb 2011-01-26 18:17:49 -08:00
Gilles Debunne
2cb4a215ad am bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb 
* commit 'bc3f79371bb93e075bcb91d92180487337afce17':
  Tabs are resized to make sure they fit in their parent.
 2011-01-26 18:10:58 -08:00
Gilles Debunne
bc3f79371b Merge "Tabs are resized to make sure they fit in their parent." into honeycomb 2011-01-26 18:09:23 -08:00
Stephen Hines
39530e77e5 Actually fix build. 
Change-Id: I43cb042b0b8c8ac0f2e5fd9aee823298f9c29820
 2011-01-26 18:07:47 -08:00
Jaikumar Ganesh
e97c01888f am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb 
* commit '55271a79d1c14e2952d550995569135a23971672':
  Disable PBAP for no voice capability
 2011-01-26 18:03:40 -08:00
Shih-wei Liao
957ee34d73 am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb 
* commit 'b9d69d595fa17ae87b4e615c2339df64a5df8324':
  For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)
 2011-01-26 18:03:31 -08:00
Dianne Hackborn
280afad7c4 am 14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '14cd455dd57f2708b63f88aab24ba6c75d13d96f':
  Import revised translations.  DO NOT MERGE
 2011-01-26 18:03:18 -08:00
Scott Main
711788bb81 am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 
* commit 'bedd242768f7594d12bde0b4c4e7d153c27858d4':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
 2011-01-26 17:58:54 -08:00
Scott Main
bedd242768 am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
 2011-01-26 17:56:26 -08:00
Jaikumar Ganesh
55271a79d1 Merge "Disable PBAP for no voice capability" into honeycomb 2011-01-26 17:52:50 -08:00
Scott Main
a7ce2f04ef Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 2011-01-26 17:52:08 -08:00
Shih-wei Liao
b9d69d595f Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb 2011-01-26 17:43:13 -08:00
Scott Main
9e6c0686be catchup the gingerbread branch to gingerbread-docs for all sdk docs 
This is just a manual copy of all files that changed, rather than a dozen cherry picks.

Change-Id: I672f74a2ec9242a1d96713d1d84bfc4d2d47dd85
 2011-01-26 17:42:49 -08:00
Dianne Hackborn
14cd455dd5 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-26 17:38:57 -08:00
Wink Saville
93fbb0ad96 am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb 
* commit '13a8f2a59c063b988502de9b7197d83b5db487d9':
  Comment out the isAvailable optimization.
 2011-01-26 17:32:10 -08:00
Xavier Ducrohet
31fd1cf769 LayoutLib: put a default image on the quickcontactbadge. 
Change-Id: I64b3f4004801ec03f374460384f9a492e66bfaf0
 2011-01-26 17:30:59 -08:00
Wink Saville
13a8f2a59c Merge "Comment out the isAvailable optimization." into honeycomb 2011-01-26 17:29:32 -08:00
Scott Main
d2b87091cc am 0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the info to the R 
* commit '0f2e2b8b82c7b589bcc603ce57f8ff3d1c947784':
  Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
 2011-01-26 17:09:21 -08:00
Scott Main
0f2e2b8b82 Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description." into honeycomb 2011-01-26 17:06:45 -08:00
Shih-wei Liao
26e5ff8a67 For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do 
on-device linking, STATIC no longer makes sense. (b/2943524)

Change-Id: Ia35f90eb0956b1cd6c436a1482d87d82f41cedc9
 2011-01-26 17:04:31 -08:00
Mike Lockwood
e797b82c76 Revert "getRingtone is causing an anr. Turn it off for now." 
ANR doesn't seem to be happening any more.

BUG: 3142881

This reverts commit c597ba8e9ad08ac628271b4498c27eda74c6c86c.

Change-Id: Ib6eb407c700bc9a8460f49394ec71d75d14588e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-26 17:00:51 -08:00
Andreas Huber
c296b57389 am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
* commit '586096a9575a52ea7fa318f6f8540b47ba2ed2e8':
  DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 16:58:04 -08:00
Jeff Brown
6774b1c592 am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps." 
* commit '91f2dbb7825af8fbef1ce5db1f42d3171d7487ce':
  Move keymaps from sdk/emulator/keymaps.
 2011-01-26 16:57:38 -08:00
Xavier Ducrohet
73b58c0bd9 am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb 
* commit 'ee37ab8dce5fe60d9a2af411ae9e38e3e44589ed':
  LayoutLib: properly erase the bitmap when rendering a new session.
 2011-01-26 16:54:31 -08:00
Xavier Ducrohet
ee37ab8dce Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb 2011-01-26 16:52:49 -08:00
Andreas Huber
586096a957 am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
  DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 16:40:04 -08:00
Xavier Ducrohet
5a82d8c58b LayoutLib: properly erase the bitmap when rendering a new session. 
This fix the issue where going from a full theme to a dialog theme
would show the dialog on top of the previous rendering.

Change-Id: Ib52b9719f44b04969423547b9de8d039f90b6f46
 2011-01-26 16:34:53 -08:00
Dianne Hackborn
c0d8f88e6a am 93257271: Merge "Remove xlarge specific icon size" into honeycomb 
* commit '93257271add728749a181e0580f2e71f3c4f129c':
  Remove xlarge specific icon size
 2011-01-26 16:30:54 -08:00
Dianne Hackborn
2c552372ce am 8c0ac870: Merge "Fix another part of #3387855: Menu flashes on left side of screen" into honeycomb 
* commit '8c0ac8708761872082c75aedc5fa4b25d1286fd0':
  Fix another part of #3387855: Menu flashes on left side of screen
 2011-01-26 16:30:49 -08:00
Eric Fischer
706a4fcb10 Import revised translations. DO NOT MERGE 
Change-Id: Ibc22cd39b0a708a8188b0a52660f484682762ef5
 2011-01-26 16:29:34 -08:00