OSDN Git Service

android-x86/frameworks-native.git
13 years agoam 82ba0eca: am 315f3865: Merge "CustomSelectionActionModeCallback can prevent select...
Gilles Debunne [Thu, 27 Jan 2011 23:11:33 +0000 (15:11 -0800)]
am 82ba0eca: am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb

* commit '82ba0ecaa72df892a34c279ac449e752e87f7ed8':
  CustomSelectionActionModeCallback can prevent selection mode from starting.

13 years agoam 7af3a6f3: am bbdd9d3f: Merge "Refresh the list of preloaded drawables and color...
Gilles Debunne [Thu, 27 Jan 2011 23:11:27 +0000 (15:11 -0800)]
am 7af3a6f3: am bbdd9d3f: Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb

* commit '7af3a6f3ddec456ade2c671e9ef53030d7b9f1a2':
  Refresh the list of preloaded drawables and color state lists

13 years agoam 19312cfe: am 246bf85a: Merge "Fix NPE with display lists when view not attached...
Chet Haase [Thu, 27 Jan 2011 23:11:20 +0000 (15:11 -0800)]
am 19312cfe: am 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb

* commit '19312cfef15608fca2c8403dc240e8ec4f54d6b7':
  Fix NPE with display lists when view not attached

13 years agoam 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode...
Gilles Debunne [Thu, 27 Jan 2011 23:00:29 +0000 (15:00 -0800)]
am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb

* commit '315f3865983f59e5ad9f42602f443e8c42b6e5c4':
  CustomSelectionActionModeCallback can prevent selection mode from starting.

13 years agoam bbdd9d3f: Merge "Refresh the list of preloaded drawables and color state lists...
Gilles Debunne [Thu, 27 Jan 2011 23:00:23 +0000 (15:00 -0800)]
am bbdd9d3f: Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb

* commit 'bbdd9d3fbc1995adb4d327515ba0af8515436d2d':
  Refresh the list of preloaded drawables and color state lists

13 years agoam 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb
Chet Haase [Thu, 27 Jan 2011 23:00:17 +0000 (15:00 -0800)]
am 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb

* commit '246bf85aaacbadf4e892270d714efcdb280a3de8':
  Fix NPE with display lists when view not attached

13 years agoMerge "CustomSelectionActionModeCallback can prevent selection mode from starting...
Gilles Debunne [Thu, 27 Jan 2011 19:07:16 +0000 (11:07 -0800)]
Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb

13 years agoMerge "Refresh the list of preloaded drawables and color state lists" into honeycomb
Gilles Debunne [Thu, 27 Jan 2011 19:07:04 +0000 (11:07 -0800)]
Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb

13 years agoMerge "Fix the build"
Irfan Sheriff [Thu, 27 Jan 2011 19:05:04 +0000 (11:05 -0800)]
Merge "Fix the build"

13 years agoMerge "Fix NPE with display lists when view not attached" into honeycomb
Chet Haase [Thu, 27 Jan 2011 18:41:26 +0000 (10:41 -0800)]
Merge "Fix NPE with display lists when view not attached" into honeycomb

13 years agoam 0966fb9e: am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEdit...
Gil Dobjanschi [Thu, 27 Jan 2011 18:36:33 +0000 (10:36 -0800)]
am 0966fb9e: am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface

* commit '0966fb9e73345b1e5ea9464e77beed07378edd6a':
  Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface

13 years agoam eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearS...
Gil Dobjanschi [Thu, 27 Jan 2011 18:34:39 +0000 (10:34 -0800)]
am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface

* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5':
  Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface

13 years agoam 1aa79d4b: am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.
Dirk Dougherty [Thu, 27 Jan 2011 18:13:18 +0000 (10:13 -0800)]
am 1aa79d4b: am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.

* commit '1aa79d4b5c2f12aa3a9ddabbdd679cd3f21a1476':
  Doc change: fix adt archive filename.

13 years agoam d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.
Dirk Dougherty [Thu, 27 Jan 2011 18:10:49 +0000 (10:10 -0800)]
am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.

* commit 'd1ca9aa561337dd294b8ae137f54b182372e69fb':
  Doc change: fix adt archive filename.

13 years agoam 591a5f86: Doc change: fix adt archive filename.
Dirk Dougherty [Thu, 27 Jan 2011 18:08:09 +0000 (10:08 -0800)]
am 591a5f86: Doc change: fix adt archive filename.

* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
  Doc change: fix adt archive filename.

13 years agoam 3f047aee: am bbc1d355: Updated stat_sys for battery and bluetooth and USB in hdpi...
Justin Ho [Thu, 27 Jan 2011 16:11:05 +0000 (08:11 -0800)]
am 3f047aee: am bbc1d355: Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi

* commit '3f047aeed0281853141172cdf4ea8b74bd7b85b4':
  Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi

13 years agoam bbc1d355: Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and...
Justin Ho [Thu, 27 Jan 2011 15:58:01 +0000 (07:58 -0800)]
am bbc1d355: Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi

* commit 'bbc1d355f8f9b9908bd152125a42c3d890a12d63':
  Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi

13 years agoam cd88c39b: am e38ba4ac: Fix gmail crossfade artifacts.
Chet Haase [Thu, 27 Jan 2011 09:32:44 +0000 (01:32 -0800)]
am cd88c39b: am e38ba4ac: Fix gmail crossfade artifacts.

* commit 'cd88c39b989fc927016aa8d1c3794b872519d575':
  Fix gmail crossfade artifacts.

13 years agoam e38ba4ac: Fix gmail crossfade artifacts.
Chet Haase [Thu, 27 Jan 2011 09:30:09 +0000 (01:30 -0800)]
am e38ba4ac: Fix gmail crossfade artifacts.

* commit 'e38ba4acbe6f1536997ffb98d662fc3eff07add8':
  Fix gmail crossfade artifacts.

13 years agoam 9d925d2d: am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy...
Jeff Brown [Thu, 27 Jan 2011 07:58:10 +0000 (23:58 -0800)]
am 9d925d2d: am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb

* commit '9d925d2dfdb2a0bd89ff081c1693129f3bf85e77':
  Handle ActivityNotFoundException in the WM policy.

13 years agoam fcf51a67: am a45c056e: Merge "Fix display List bugs" into honeycomb
Chet Haase [Thu, 27 Jan 2011 07:55:50 +0000 (23:55 -0800)]
am fcf51a67: am a45c056e: Merge "Fix display List bugs" into honeycomb

* commit 'fcf51a67967a402bf2178c3d0e09828e8942cade':
  Fix display List bugs

13 years agoam da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb
Jeff Brown [Thu, 27 Jan 2011 07:54:16 +0000 (23:54 -0800)]
am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb

* commit 'da910fd5ea024f214f806d880d86d77bf94497b5':
  Handle ActivityNotFoundException in the WM policy.

13 years agoMerge "Handle ActivityNotFoundException in the WM policy." into honeycomb
Jeff Brown [Thu, 27 Jan 2011 07:52:41 +0000 (23:52 -0800)]
Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb

13 years agoam a45c056e: Merge "Fix display List bugs" into honeycomb
Chet Haase [Thu, 27 Jan 2011 07:51:58 +0000 (23:51 -0800)]
am a45c056e: Merge "Fix display List bugs" into honeycomb

* commit 'a45c056e62be0ca97edbdd6f6660822cf453c886':
  Fix display List bugs

13 years agoam b43610f8: am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb
Jeff Brown [Thu, 27 Jan 2011 07:51:36 +0000 (23:51 -0800)]
am b43610f8: am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb

* commit 'b43610f8c9994163a1b69d23ac893de3f80a5355':
  Fix down arrow in AutoCompleteTextView.

13 years agoam f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb
Jeff Brown [Thu, 27 Jan 2011 07:49:41 +0000 (23:49 -0800)]
am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb

* commit 'f02853f211f0b7f698f82305e30c23e527192584':
  Fix down arrow in AutoCompleteTextView.

13 years agoMerge "Fix display List bugs" into honeycomb
Chet Haase [Thu, 27 Jan 2011 07:49:23 +0000 (23:49 -0800)]
Merge "Fix display List bugs" into honeycomb

13 years agoam 7489a470: am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into...
Vasu Nori [Thu, 27 Jan 2011 07:47:22 +0000 (23:47 -0800)]
am 7489a470: am d529d0df: Merge "bug:3396894  (HC branch) remove STOPSHIP code" into honeycomb

* commit '7489a4709daf39aff61a17818de282d9ca4dc7c8':
  bug:3396894  (HC branch) remove STOPSHIP code

13 years agoMerge "Fix down arrow in AutoCompleteTextView." into honeycomb
Jeff Brown [Thu, 27 Jan 2011 07:45:59 +0000 (23:45 -0800)]
Merge "Fix down arrow in AutoCompleteTextView." into honeycomb

13 years agoam d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
Vasu Nori [Thu, 27 Jan 2011 07:45:27 +0000 (23:45 -0800)]
am d529d0df: Merge "bug:3396894  (HC branch) remove STOPSHIP code" into honeycomb

* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e':
  bug:3396894  (HC branch) remove STOPSHIP code

13 years agoMerge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
Vasu Nori [Thu, 27 Jan 2011 07:43:17 +0000 (23:43 -0800)]
Merge "bug:3396894  (HC branch) remove STOPSHIP code" into honeycomb

13 years agoam a7477f6b: am c291a7bf: Merge "The calendar view widget was jumping incorrectly...
Svetoslav Ganov [Thu, 27 Jan 2011 07:03:01 +0000 (23:03 -0800)]
am a7477f6b: am c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb

* commit 'a7477f6b1c2222bc2cc71416cad108adc0b6f0a3':
  The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.

13 years agoam c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next...
Svetoslav Ganov [Thu, 27 Jan 2011 07:01:03 +0000 (23:01 -0800)]
am c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb

* commit 'c291a7bf7a163cea10be135279103f72a6418383':
  The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.

13 years agoMerge "The calendar view widget was jumping incorrectly to the next week while select...
Svetoslav Ganov [Thu, 27 Jan 2011 06:59:23 +0000 (22:59 -0800)]
Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb

13 years agoam 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications...
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:54:41 +0000 (22:54 -0800)]
am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
  Revert "Video editor CTS: Framework modifications"

13 years agoam 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:54:37 +0000 (22:54 -0800)]
am 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb

* commit '141a2adb25130bcbe8620ae239e94d33c7c92eef':
  Revert "Fixes Issue ID: 3396697"

13 years agoam 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:52:38 +0000 (22:52 -0800)]
am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
  Revert "Video editor CTS: Framework modifications"

13 years agoam 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:52:31 +0000 (22:52 -0800)]
am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb

* commit '3b728ca70a4fe6760b682589505d76848c47d765':
  Revert "Fixes Issue ID: 3396697"

13 years agoMerge "Revert "Video editor CTS: Framework modifications"" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:50:59 +0000 (22:50 -0800)]
Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

13 years agoMerge "Revert "Fixes Issue ID: 3396697"" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:50:50 +0000 (22:50 -0800)]
Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb

13 years agoam 38f34ed2: am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug...
Romain Guy [Thu, 27 Jan 2011 06:49:13 +0000 (22:49 -0800)]
am 38f34ed2: am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197" into honeycomb

* commit '38f34ed20a52d027cbf1b72fe22c6d616810613b':
  Don't draw the same triangles several times. Bug #3388197

13 years agoam 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197" into...
Romain Guy [Thu, 27 Jan 2011 06:47:01 +0000 (22:47 -0800)]
am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197" into honeycomb

* commit '7c53a0d6078620df3abc4997acfe267ef903f5c6':
  Don't draw the same triangles several times. Bug #3388197

13 years agoam a05a3e3a: am 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation...
Adam Cohen [Thu, 27 Jan 2011 06:46:57 +0000 (22:46 -0800)]
am a05a3e3a: am 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb

* commit 'a05a3e3ad7fbb27d1629836141e9d52937299bda':
  Fixing some ugly StackView relayouts on rotation

13 years agoam 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
Adam Cohen [Thu, 27 Jan 2011 06:44:53 +0000 (22:44 -0800)]
am 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb

* commit '3b52ca3bbcb989200abff5582ef569d5f316d7f5':
  Fixing some ugly StackView relayouts on rotation

13 years agoMerge "Don't draw the same triangles several times. Bug #3388197" into honeycomb
Romain Guy [Thu, 27 Jan 2011 06:44:02 +0000 (22:44 -0800)]
Merge "Don't draw the same triangles several times. Bug #3388197" into honeycomb

13 years agoMerge "Fixing some ugly StackView relayouts on rotation" into honeycomb
Adam Cohen [Thu, 27 Jan 2011 06:41:43 +0000 (22:41 -0800)]
Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb

13 years agoam 7c77bd0e: am e193c468: Merge "Fix 3388705: Explicitly check for low battery level...
Joe Onorato [Thu, 27 Jan 2011 06:26:15 +0000 (22:26 -0800)]
am 7c77bd0e: am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb

* commit '7c77bd0e3dda93242e7dbcfb4754817894483653':
  Fix 3388705: Explicitly check for low battery level

13 years agoam e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
Joe Onorato [Thu, 27 Jan 2011 06:23:56 +0000 (22:23 -0800)]
am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb

* commit 'e193c4688f9062e1d4dba97413788b6ffa122a55':
  Fix 3388705: Explicitly check for low battery level

13 years agoMerge "Fix 3388705: Explicitly check for low battery level" into honeycomb
Joe Onorato [Thu, 27 Jan 2011 06:21:26 +0000 (22:21 -0800)]
Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb

13 years agoam 5702e88b: am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off...
Joe Onorato [Thu, 27 Jan 2011 06:04:41 +0000 (22:04 -0800)]
am 5702e88b: am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb

* commit '5702e88b7f7fa72acfe9a34bffde54f578b1a94a':
  Revert "getRingtone is causing an anr. Turn it off for now."

13 years agoam ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."...
Joe Onorato [Thu, 27 Jan 2011 06:02:18 +0000 (22:02 -0800)]
am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb

* commit 'ea1fbe9c8c9fe32690252dcc4dc96c93ae03f686':
  Revert "getRingtone is causing an anr. Turn it off for now."

13 years agoMerge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
Joe Onorato [Thu, 27 Jan 2011 06:00:07 +0000 (22:00 -0800)]
Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb

13 years agoam a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into...
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:54:16 +0000 (21:54 -0800)]
am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb

* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
  Video editor CTS: Framework modifications

13 years agoam 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:52:02 +0000 (21:52 -0800)]
am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb

* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
  Fixes Issue ID: 3396697

13 years agoam 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:51:49 +0000 (21:51 -0800)]
am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb

* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
  Video editor CTS: Framework modifications

13 years agoam 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:49:34 +0000 (21:49 -0800)]
am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb

* commit '643e8476e1b9da93a06d073797863298ae268393':
  Fixes Issue ID: 3396697

13 years agoMerge "Video editor CTS: Framework modifications" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:48:02 +0000 (21:48 -0800)]
Merge "Video editor CTS: Framework modifications" into honeycomb

13 years agoMerge "Fixes Issue ID: 3396697" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:47:40 +0000 (21:47 -0800)]
Merge "Fixes Issue ID: 3396697" into honeycomb

13 years agoam 5d15cc71: am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb
Justin Ho [Thu, 27 Jan 2011 05:44:22 +0000 (21:44 -0800)]
am 5d15cc71: am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb

* commit '5d15cc7174388af04a9897c03bcd7e4d81e578b2':
  New stat_sys_download/upload icons

13 years agoam 08006286: Merge "New stat_sys_download/upload icons" into honeycomb
Justin Ho [Thu, 27 Jan 2011 05:41:50 +0000 (21:41 -0800)]
am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb

* commit '08006286b40cf9031766a97e4d50ebb47c8b514d':
  New stat_sys_download/upload icons

13 years agoMerge "New stat_sys_download/upload icons" into honeycomb
Justin Ho [Thu, 27 Jan 2011 05:37:22 +0000 (21:37 -0800)]
Merge "New stat_sys_download/upload icons" into honeycomb

13 years agoam f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into...
James Dong [Thu, 27 Jan 2011 05:20:16 +0000 (21:20 -0800)]
am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb

* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
  Eliminate duplicated code in export method

13 years agoam 1f8e2f99: am 5d506fa7: Merge "Add API for preferred Launcher icon size and density...
Kenny Root [Thu, 27 Jan 2011 05:19:59 +0000 (21:19 -0800)]
am 1f8e2f99: am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb

* commit '1f8e2f99585040b3904f1b6863000d9d208eda02':
  Add API for preferred Launcher icon size and density

13 years agoam 8c7fd1e9: am 62461d12: Merge "LayoutLib: put a default image on the quickcontactba...
Xavier Ducrohet [Thu, 27 Jan 2011 05:19:42 +0000 (21:19 -0800)]
am 8c7fd1e9: am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb

* commit '8c7fd1e96a012c6ebc8bdf1b38df7667456b8fcb':
  LayoutLib: put a default image on the quickcontactbadge.

13 years agoam df82ad9f: am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves...
Jim Miller [Thu, 27 Jan 2011 05:19:36 +0000 (21:19 -0800)]
am df82ad9f: am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb

* commit 'df82ad9fb239572f3076ffc8894697b9de3d18d1':
  Fix 3381324: Restart ripples when the user moves away from the edge.

13 years agoam 5b78e092: am 597e644d: Merge "Integrating xlarge mdpi battery charging assets...
Justin Ho [Thu, 27 Jan 2011 05:19:30 +0000 (21:19 -0800)]
am 5b78e092: am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb

* commit '5b78e092dd7a97c47169f3442e73c1c934002cbc':
  Integrating xlarge mdpi battery charging assets

13 years agoam cda2da1f: am 85fd2c91: Merge "fix incognito url loading" into honeycomb
Michael Kolb [Thu, 27 Jan 2011 05:19:20 +0000 (21:19 -0800)]
am cda2da1f: am 85fd2c91: Merge "fix incognito url loading" into honeycomb

* commit 'cda2da1f23f7be6dd2c41746a49ff41bf66958df':
  fix incognito url loading

13 years agoam 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
James Dong [Thu, 27 Jan 2011 05:15:37 +0000 (21:15 -0800)]
am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb

* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
  Eliminate duplicated code in export method

13 years agoam 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
Kenny Root [Thu, 27 Jan 2011 05:15:28 +0000 (21:15 -0800)]
am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb

* commit '5d506fa7274e8ba84e348e11c22729b58802f796':
  Add API for preferred Launcher icon size and density

13 years agoam 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into...
Xavier Ducrohet [Thu, 27 Jan 2011 05:15:22 +0000 (21:15 -0800)]
am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb

* commit '62461d128fcb1314d96661e77f9744e5e50f57e3':
  LayoutLib: put a default image on the quickcontactbadge.

13 years agoam 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the...
Jim Miller [Thu, 27 Jan 2011 05:15:17 +0000 (21:15 -0800)]
am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb

* commit '57d472a5b1f69e3aa0159f41c7ef625d4418c27f':
  Fix 3381324: Restart ripples when the user moves away from the edge.

13 years agoam 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
Justin Ho [Thu, 27 Jan 2011 05:15:10 +0000 (21:15 -0800)]
am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb

* commit '597e644d7a445e6f5555f3f51b6ed78b1e6c1243':
  Integrating xlarge mdpi battery charging assets

13 years agoam 85fd2c91: Merge "fix incognito url loading" into honeycomb
Michael Kolb [Thu, 27 Jan 2011 05:15:01 +0000 (21:15 -0800)]
am 85fd2c91: Merge "fix incognito url loading" into honeycomb

* commit '85fd2c9102f7cf105bf498f05ca35360a4bcede5':
  fix incognito url loading

13 years agoMerge "Eliminate duplicated code in export method" into honeycomb
James Dong [Thu, 27 Jan 2011 04:42:18 +0000 (20:42 -0800)]
Merge "Eliminate duplicated code in export method" into honeycomb

13 years agoMerge "Add API for preferred Launcher icon size and density" into honeycomb
Kenny Root [Thu, 27 Jan 2011 04:16:31 +0000 (20:16 -0800)]
Merge "Add API for preferred Launcher icon size and density" into honeycomb

13 years agoMerge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
Xavier Ducrohet [Thu, 27 Jan 2011 03:54:46 +0000 (19:54 -0800)]
Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb

13 years agoMerge "Fix 3381324: Restart ripples when the user moves away from the edge." into...
Jim Miller [Thu, 27 Jan 2011 03:39:23 +0000 (19:39 -0800)]
Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb

13 years agoMerge "Integrating xlarge mdpi battery charging assets" into honeycomb
Justin Ho [Thu, 27 Jan 2011 03:34:50 +0000 (19:34 -0800)]
Merge "Integrating xlarge mdpi battery charging assets" into honeycomb

13 years agoMerge "fix incognito url loading" into honeycomb
Michael Kolb [Thu, 27 Jan 2011 03:21:49 +0000 (19:21 -0800)]
Merge "fix incognito url loading" into honeycomb

13 years agoam f35d43f9: am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters...
Dianne Hackborn [Thu, 27 Jan 2011 03:17:46 +0000 (19:17 -0800)]
am f35d43f9: am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb

* commit 'f35d43f90b9e4553343a59b217430aaba91b0d1f':
  Fix issue #3382992: IME close animation stutters from URL bar

13 years agoam 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp...
Scott Main [Thu, 27 Jan 2011 03:13:54 +0000 (19:13 -0800)]
am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '796f1af04567dab098f638c9166caebc2818efe4':
  enable preview mode for docs and add api level 10 flag for api level diffs

13 years agoam 0d8f88b2: am ede54ce2: Merge "Fix crash in movie studio." into honeycomb
Romain Guy [Thu, 27 Jan 2011 03:13:50 +0000 (19:13 -0800)]
am 0d8f88b2: am ede54ce2: Merge "Fix crash in movie studio." into honeycomb

* commit '0d8f88b272f80f2a3594d2d988faabed4e540631':
  Fix crash in movie studio.

13 years agoam 0518e7b5: am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with...
Romain Guy [Thu, 27 Jan 2011 03:13:40 +0000 (19:13 -0800)]
am 0518e7b5: am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487" into honeycomb

* commit '0518e7b5bddfdeb010591c736fb080009a99cd14':
  Make sure that we update SurfaceView's window with display lists. Bug #3395487

13 years agoam 0517ea2a: am da597b5c: Merge "Status bar visual tweaks." into honeycomb
Daniel Sandler [Thu, 27 Jan 2011 03:13:33 +0000 (19:13 -0800)]
am 0517ea2a: am da597b5c: Merge "Status bar visual tweaks." into honeycomb

* commit '0517ea2ab8e4dae5fe2394cfecced6afb121b95e':
  Status bar visual tweaks.

13 years agoam 2cb4a215: am bc3f7937: Merge "Tabs are resized to make sure they fit in their...
Gilles Debunne [Thu, 27 Jan 2011 03:13:24 +0000 (19:13 -0800)]
am 2cb4a215: am bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb

* commit '2cb4a215ad3d42fe9b90a1b045d5ce1c3d09bf9d':
  Tabs are resized to make sure they fit in their parent.

13 years agoam e97c0188: am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb
Jaikumar Ganesh [Thu, 27 Jan 2011 03:11:20 +0000 (19:11 -0800)]
am e97c0188: am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb

* commit 'e97c01888fcc94453041eb6adc575598d744b580':
  Disable PBAP for no voice capability

13 years agoam 957ee34d: am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host...
Shih-wei Liao [Thu, 27 Jan 2011 03:11:15 +0000 (19:11 -0800)]
am 957ee34d: 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 '957ee34d73e6b0bec91edaad57be641834855758':
  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)

13 years agoam 280afad7: (-s ours) am 14cd455d: Merge "Import revised translations. DO NOT MERGE...
Dianne Hackborn [Thu, 27 Jan 2011 03:11:09 +0000 (19:11 -0800)]
am 280afad7: (-s ours) am 14cd455d: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '280afad7c406a0d2bba966448c8b388d7f726b8a':
  Import revised translations.  DO NOT MERGE

13 years agoam 711788bb: am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to ginge...
Scott Main [Thu, 27 Jan 2011 03:10:38 +0000 (19:10 -0800)]
am 711788bb: am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread

* commit '711788bb81cfb8b62e9bd7284f01a1d2b55fac8d':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs

13 years agoam 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." into...
Wink Saville [Thu, 27 Jan 2011 03:09:22 +0000 (19:09 -0800)]
am 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb

* commit '93fbb0ad960a658633dfa2bc7be9584e4361ab85':
  Comment out the isAvailable optimization.

13 years agoam d2b87091: am 0f2e2b8b: Merge "Update package descriptions with editorial revisions...
Scott Main [Thu, 27 Jan 2011 03:08:55 +0000 (19:08 -0800)]
am d2b87091: 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

* commit 'd2b87091cc30c575496eb78ebea88297da775359':
  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.

13 years agoam c296b573: (-s ours) am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particu...
Andreas Huber [Thu, 27 Jan 2011 03:08:49 +0000 (19:08 -0800)]
am c296b573: (-s ours) am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

* commit 'c296b5738947003c96dfc5b93c86f27b955429ff':
  DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

13 years agoam 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulato...
Jeff Brown [Thu, 27 Jan 2011 03:08:42 +0000 (19:08 -0800)]
am 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."

* commit '6774b1c5920be3f5be8ce2d5b5c0f620bd271dbc':
  Move keymaps from sdk/emulator/keymaps.

13 years agoam 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar...
Dianne Hackborn [Thu, 27 Jan 2011 03:08:20 +0000 (19:08 -0800)]
am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb

* commit '2dc9c784b2fab67a8233318f559e65f444bf0c97':
  Fix issue #3382992: IME close animation stutters from URL bar

13 years agoam 73b58c0b: am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering...
Xavier Ducrohet [Thu, 27 Jan 2011 03:08:20 +0000 (19:08 -0800)]
am 73b58c0b: am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb

* commit '73b58c0bd9faf99b19c1fcfe5bcf94cebd65634e':
  LayoutLib: properly erase the bitmap when rendering a new session.

13 years agoam c0d8f88e: am 93257271: Merge "Remove xlarge specific icon size" into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 03:08:05 +0000 (19:08 -0800)]
am c0d8f88e: am 93257271: Merge "Remove xlarge specific icon size" into honeycomb

* commit 'c0d8f88e6aa0cd0e18ff8ddb0d4c479b06e691b4':
  Remove xlarge specific icon size

13 years agoam 2c552372: am 8c0ac870: Merge "Fix another part of #3387855: Menu flashes on left...
Dianne Hackborn [Thu, 27 Jan 2011 03:07:57 +0000 (19:07 -0800)]
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

13 years agoam 5640392f: am 2d63144e: Merge "Fix issue #3380072: Switching in and out of gmail...
Dianne Hackborn [Thu, 27 Jan 2011 03:07:46 +0000 (19:07 -0800)]
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

13 years agoam ba492eb6: am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constan...
Mike Lockwood [Thu, 27 Jan 2011 03:07:34 +0000 (19:07 -0800)]
am ba492eb6: am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb

* commit 'ba492eb636a45cd5686fb0e6eb807e3deaa500fb':
  Fix javadoc for MediaStore.Files.FileColumns constants

13 years agoam ab4ea688: am b90a91c6: Making requested indices the last to be pruned when we...
Winson Chung [Thu, 27 Jan 2011 03:07:13 +0000 (19:07 -0800)]
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)