OSDN Git Service

android-x86/frameworks-base.git
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 agoThe calendar view widget was jumping incorrectly to the next week
Svetoslav Ganov [Thu, 27 Jan 2011 06:50:51 +0000 (22:50 -0800)]
The calendar view widget was jumping incorrectly to the next week
while selectiong the last day of the week.

The NumberPicker widget was getting into an inconsitent state when
reaching the end of the range (non wrapping selector wheel) and
the user touches the location of the hidden increment/decrement
button.

Change-Id: Id54103295dd2574030e2c29996061faa659a5bb7

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 agoDon't draw the same triangles several times.
Romain Guy [Thu, 27 Jan 2011 06:41:43 +0000 (22:41 -0800)]
Don't draw the same triangles several times.
Bug #3388197

Change-Id: Ief1dfd9447f144e9992340a173d2893e5e049129

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 agoRevert "Video editor CTS: Framework modifications"
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:38:47 +0000 (22:38 -0800)]
Revert "Video editor CTS: Framework modifications"

This reverts commit eb6d6ecf4ba7a3965ce6ab178dce48eb9416bfc7.

13 years agoRevert "Fixes Issue ID: 3396697"
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:36:10 +0000 (22:36 -0800)]
Revert "Fixes Issue ID: 3396697"

This reverts commit 8b9ba616444a265df6cd2b4f4a0a39d808c65ade.

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 agoFixing some ugly StackView relayouts on rotation
Adam Cohen [Thu, 27 Jan 2011 05:32:33 +0000 (21:32 -0800)]
Fixing some ugly StackView relayouts on rotation

Change-Id: Ic4b11637ed73e60e1af1fcd27e5610d8f84a31fe

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 agoFix 3388705: Explicitly check for low battery level
Jim Miller [Thu, 27 Jan 2011 05:58:28 +0000 (21:58 -0800)]
Fix 3388705: Explicitly check for low battery level

This fixes a bug in StatusView believed to be caused by
seeing "invalid charger" update from BatteryService.

The code normally relies on "interesting events", as determined
by KeyguardUpdateMonitor.  I believe something else is
triggering an update (perhaps a SimStateChanged event) that updates
the status without also updating StatusView.mShowingBatteryInfo
and mPluggedIn.

The safer way to do this is to explicitly check the battery
level before telling the user the device needs to be charged.

Change-Id: Ic39ed86c78a157dc9fbdef4d76a9c3db39ccafca

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 agoNew stat_sys_download/upload icons
Justin Ho [Thu, 27 Jan 2011 05:34:14 +0000 (21:34 -0800)]
New stat_sys_download/upload icons

Change-Id: I8f2f8e2a097ea4b52e95429aa8bbd29177385c3d

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 agoVideo editor CTS: Framework modifications
Basavapatna Dattaguru [Tue, 18 Jan 2011 17:03:13 +0000 (09:03 -0800)]
Video editor CTS: Framework modifications

Fixes Issue ID: 3396697

Copyright changed to 2011

Change-Id: I1b69c6903bb6b0434eb93337783f93c92fd20899

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 agoFixes Issue ID: 3396697
Basavapatna Dattaguru [Tue, 18 Jan 2011 04:45:36 +0000 (20:45 -0800)]
Fixes Issue ID: 3396697

Updated with annotation LargeTest

Copyright changed to 2011

Review reworked and with new test contents

Video Editor CTS Test code

Change-Id: Ia37956ef39fafcc5d969996c1791fce8663aa0fe

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 agoEliminate duplicated code in export method
James Dong [Wed, 26 Jan 2011 20:32:59 +0000 (12:32 -0800)]
Eliminate duplicated code in export method

bug - 3385135

Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d

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 agoAdd API for preferred Launcher icon size and density
Kenny Root [Thu, 27 Jan 2011 01:22:20 +0000 (17:22 -0800)]
Add API for preferred Launcher icon size and density

Applications that create an icon for launcher to use couldn't determine
which size or density the icon should be created.

Bug: 3224340
Change-Id: Iee96113a4092696a9bd18eecbd2593b38f952a16

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 agoIntegrating xlarge mdpi battery charging assets
Justin Ho [Thu, 27 Jan 2011 03:31:45 +0000 (19:31 -0800)]
Integrating xlarge mdpi battery charging assets

Change-Id: Iec541ec384fcf69d7de0c2a75031714d0d232f2a

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 agofix incognito url loading
Michael Kolb [Thu, 27 Jan 2011 03:11:02 +0000 (19:11 -0800)]
fix incognito url loading

    http://b/issue?id=3349090
    removed the loading of the "browser:incognito" url

Change-Id: I47f952d372b4d69e91d4b29b3b5e5ec46a4f4fc3

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)

13 years agoam bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio...
Andreas Huber [Thu, 27 Jan 2011 03:06:43 +0000 (19:06 -0800)]
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.

13 years agoam eaa738ef: am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPa...
Jim Miller [Thu, 27 Jan 2011 03:06:30 +0000 (19:06 -0800)]
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

13 years agoMerge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 03:04:15 +0000 (19:04 -0800)]
Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb

13 years agoFix 3381324: Restart ripples when the user moves away from the edge.
Jim Miller [Thu, 27 Jan 2011 03:02:32 +0000 (19:02 -0800)]
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

13 years agoFix issue #3382992: IME close animation stutters from URL bar
Dianne Hackborn [Thu, 27 Jan 2011 02:56:29 +0000 (18:56 -0800)]
Fix issue #3382992: IME close animation stutters from URL bar

Gross hack is grosser.

Change-Id: I0a34bf1d7c16c547402318f24776a5f7e8b7552b

13 years agoMerge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycom...
Scott Main [Thu, 27 Jan 2011 02:48:22 +0000 (18:48 -0800)]
Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp

13 years agoam ede54ce2: Merge "Fix crash in movie studio." into honeycomb
Romain Guy [Thu, 27 Jan 2011 02:47:59 +0000 (18:47 -0800)]
am ede54ce2: Merge "Fix crash in movie studio." into honeycomb

* commit 'ede54ce2fe3252d4ab56b90de464b35a6920970d':
  Fix crash in movie studio.

13 years agoresolved conflicts for merge of 77ba255e to honeycomb-plus-aosp
Scott Main [Thu, 27 Jan 2011 02:45:42 +0000 (18:45 -0800)]
resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp

Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab

13 years agoMerge "Fix crash in movie studio." into honeycomb
Romain Guy [Thu, 27 Jan 2011 02:46:29 +0000 (18:46 -0800)]
Merge "Fix crash in movie studio." into honeycomb

13 years agoFix crash in movie studio.
Romain Guy [Thu, 27 Jan 2011 02:45:28 +0000 (18:45 -0800)]
Fix crash in movie studio.

Change-Id: I06acb0b39cc3839cf7abb58b32dec9b9bec424d6

13 years agoam ba3dd323: enable preview mode for docs and add api level 10 flag for api level...
Scott Main [Thu, 27 Jan 2011 02:37:22 +0000 (18:37 -0800)]
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

13 years agoam 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists...
Romain Guy [Thu, 27 Jan 2011 02:32:54 +0000 (18:32 -0800)]
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

13 years agoMake sure that we update SurfaceView's window with display lists.
Romain Guy [Thu, 27 Jan 2011 02:31:23 +0000 (18:31 -0800)]
Make sure that we update SurfaceView's window with display lists.
Bug #3395487

Change-Id: Idaef3953a596ee3b4049a2d8aef6dda676b1545b

13 years agoenable preview mode for docs and add api level 10 flag for api level diffs
Scott Main [Thu, 27 Jan 2011 01:40:35 +0000 (17:40 -0800)]
enable preview mode for docs and add api level 10 flag for api level diffs

Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc

13 years agoMerge "Make sure that we update SurfaceView's window with display lists. Bug #3395487...
Romain Guy [Thu, 27 Jan 2011 02:29:38 +0000 (18:29 -0800)]
Merge "Make sure that we update SurfaceView's window with display lists. Bug #3395487" into honeycomb

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

* commit 'da597b5c1a6553a43f1e938ef87b29c8f2a59386':
  Status bar visual tweaks.

13 years agoMerge "Status bar visual tweaks." into honeycomb
Daniel Sandler [Thu, 27 Jan 2011 02:17:49 +0000 (18:17 -0800)]
Merge "Status bar visual tweaks." into honeycomb

13 years agoam bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into...
Gilles Debunne [Thu, 27 Jan 2011 02:10:58 +0000 (18:10 -0800)]
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.