OSDN Git Service

android-x86/frameworks-base.git
13 years agoam f7c60a05: am e06c3a59: Merge "Fix cleanup race condition where objects might may...
Jason Sams [Mon, 10 Jan 2011 00:50:15 +0000 (16:50 -0800)]
am f7c60a05: am e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb

* commit 'f7c60a05bf610ad9cb6914a296dfebb72f1ad2c5':
  Fix cleanup race condition where objects might may not be cleaned up correctly.

13 years agoam e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned...
Jason Sams [Mon, 10 Jan 2011 00:48:25 +0000 (16:48 -0800)]
am e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb

* commit 'e06c3a599f5d274ef7b1afa694ac2b1961f75aeb':
  Fix cleanup race condition where objects might may not be cleaned up correctly.

13 years agoam b6c4f790: am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED...
Romain Guy [Mon, 10 Jan 2011 00:47:09 +0000 (16:47 -0800)]
am b6c4f790: am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb

* commit 'b6c4f7904aa320d2129ef5b235e25d8827e45fb6':
  Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883

13 years agoMerge "Fix cleanup race condition where objects might may not be cleaned up correctly...
Jason Sams [Mon, 10 Jan 2011 00:46:25 +0000 (16:46 -0800)]
Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb

13 years agoam 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883...
Romain Guy [Mon, 10 Jan 2011 00:44:14 +0000 (16:44 -0800)]
am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb

* commit '867b1f60e6c2fff4650e5edc4409b26c9c605f00':
  Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883

13 years agoam 497e4314: am 4c93fbce: Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and...
Mike Lockwood [Mon, 10 Jan 2011 00:43:18 +0000 (16:43 -0800)]
am 497e4314: am 4c93fbce: Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb

* commit '497e4314b07a04ec6619c28b8e2a1a589186a31b':
  Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts

13 years agoMerge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb
Romain Guy [Mon, 10 Jan 2011 00:42:35 +0000 (16:42 -0800)]
Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb

13 years agoBetter documentation for FLAG_HARDWARE_ACCELERATED
Romain Guy [Mon, 10 Jan 2011 00:01:46 +0000 (16:01 -0800)]
Better documentation for FLAG_HARDWARE_ACCELERATED
Bug #3154883

Change-Id: I2062781ba3b447b8ec4e0836b9ddeaa97c7aa60e

13 years agoam 4c93fbce: Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DET...
Mike Lockwood [Mon, 10 Jan 2011 00:41:07 +0000 (16:41 -0800)]
am 4c93fbce: Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb

* commit '4c93fbce79de64780696c737424e8c41cbbd06ae':
  Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts

13 years agoMerge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadca...
Mike Lockwood [Mon, 10 Jan 2011 00:39:37 +0000 (16:39 -0800)]
Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb

13 years agoam d320877f: am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.
Brett Chabot [Mon, 10 Jan 2011 00:38:08 +0000 (16:38 -0800)]
am d320877f: am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.

* commit 'd320877f32ddfc70b10457e0ea1494f6ef1f544b':
  Add ActivityManager#isRunningInTestHarness() public API.

13 years agoFramework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts
Mike Lockwood [Mon, 10 Jan 2011 00:37:29 +0000 (19:37 -0500)]
Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts

These broadcasts no longer exist, so remove their <protected-broadcast> elements from the manifest.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Change-Id: I4a724509d3058f16283870f02e5e1b51dfb21a43

13 years agoam 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.
Brett Chabot [Mon, 10 Jan 2011 00:35:59 +0000 (16:35 -0800)]
am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.

* commit '3b4fcbc9f13bab6a2e9e5c37cc5e18fec7341c04':
  Add ActivityManager#isRunningInTestHarness() public API.

13 years agoam 92752f74: am ac0f347e: Merge "Honeycomb styling for the volume panel" into honeycomb
Adam Powell [Mon, 10 Jan 2011 00:32:25 +0000 (16:32 -0800)]
am 92752f74: am ac0f347e: Merge "Honeycomb styling for the volume panel" into honeycomb

* commit '92752f74987d96fc949268c98614ff551374e3eb':
  Honeycomb styling for the volume panel

13 years agoAdd ActivityManager#isRunningInTestHarness() public API.
Brett Chabot [Sun, 9 Jan 2011 21:41:02 +0000 (13:41 -0800)]
Add ActivityManager#isRunningInTestHarness() public API.

Replaces use of ro.monkey system property. This new API is controlled by
ro.test_harness.

Bug 3329873

Change-Id: Idb5bbbd9ca691976ef842eec681be34c29915976

13 years agoam ac0f347e: Merge "Honeycomb styling for the volume panel" into honeycomb
Adam Powell [Mon, 10 Jan 2011 00:30:14 +0000 (16:30 -0800)]
am ac0f347e: Merge "Honeycomb styling for the volume panel" into honeycomb

* commit 'ac0f347ed83d53bbfcef7e92acd8b481be044852':
  Honeycomb styling for the volume panel

13 years agoMerge "Honeycomb styling for the volume panel" into honeycomb
Adam Powell [Mon, 10 Jan 2011 00:28:26 +0000 (16:28 -0800)]
Merge "Honeycomb styling for the volume panel" into honeycomb

13 years agoam 108221ee: am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb
Eric Laurent [Mon, 10 Jan 2011 00:28:14 +0000 (16:28 -0800)]
am 108221ee: am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb

* commit '108221ee8c34db657f7a82ba01dd04fe3d76b19c':
  Fix issue 3317627.

13 years agoam 2f67e0e7: Merge "Fix issue 3317627." into honeycomb
Eric Laurent [Mon, 10 Jan 2011 00:26:06 +0000 (16:26 -0800)]
am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb

* commit '2f67e0e746e976960b5e11045c7b455307055558':
  Fix issue 3317627.

13 years agoHoneycomb styling for the volume panel
Adam Powell [Mon, 10 Jan 2011 00:26:00 +0000 (16:26 -0800)]
Honeycomb styling for the volume panel

Change-Id: If0c870a07b8116c1b22a199de2021da46d69316b

13 years agoMerge "Fix issue 3317627." into honeycomb
Eric Laurent [Mon, 10 Jan 2011 00:24:51 +0000 (16:24 -0800)]
Merge "Fix issue 3317627." into honeycomb

13 years agoam b3a82ebd: am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator...
Jim Miller [Mon, 10 Jan 2011 00:12:58 +0000 (16:12 -0800)]
am b3a82ebd: am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb

* commit 'b3a82ebd6e7e9c68a907ff49e396de9f6a8ccaee':
  Fix 3299611: Use system font for AM/PM indicator

13 years agoam 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb
Jim Miller [Mon, 10 Jan 2011 00:10:19 +0000 (16:10 -0800)]
am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb

* commit '730f0b238a20362ff0ae6bdfbd069f0996fc1b39':
  Fix 3299611: Use system font for AM/PM indicator

13 years agoFix cleanup race condition where objects might may not
Jason Sams [Mon, 10 Jan 2011 00:09:51 +0000 (16:09 -0800)]
Fix cleanup race condition where objects might may not
be cleaned up correctly.

Change-Id: Ia48e06c3d050b6b39b39f8fdc9f0eb89b92fe1bf

13 years agoMerge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb
Jim Miller [Mon, 10 Jan 2011 00:08:58 +0000 (16:08 -0800)]
Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb

13 years agoFix issue 3317627.
Eric Laurent [Sun, 9 Jan 2011 23:33:01 +0000 (15:33 -0800)]
Fix issue 3317627.

The fix consists in selecting the digital audio device (SPDIF/HDMI)
when available if the routing strategy is STRATEGY_PHONE.

Change-Id: Ie500ae92f5c01f2511988543852ba559c6e5994b

13 years agoFix 3299611: Use system font for AM/PM indicator
Jim Miller [Mon, 10 Jan 2011 00:03:27 +0000 (16:03 -0800)]
Fix 3299611: Use system font for AM/PM indicator

This fixes a bug where translations wouldn't pick up the proper
AM/PM indicator because AndroidClock.ttf doesn't contain the
full Android character set for translations.

Change-Id: I61737bae7383946906a4e6b776afa7463da9355d

13 years agoam 0010e803: am edca0e4d: Merge "Hardware Composer Commit Points Benchmark" into...
Louis Huemiller [Sun, 9 Jan 2011 23:46:59 +0000 (15:46 -0800)]
am 0010e803: am edca0e4d: Merge "Hardware Composer Commit Points Benchmark" into honeycomb

* commit '0010e80304f770c4d343515eb7520cb89fcc2676':
  Hardware Composer Commit Points Benchmark

13 years agoam edca0e4d: Merge "Hardware Composer Commit Points Benchmark" into honeycomb
Louis Huemiller [Sun, 9 Jan 2011 23:45:25 +0000 (15:45 -0800)]
am edca0e4d: Merge "Hardware Composer Commit Points Benchmark" into honeycomb

* commit 'edca0e4d134610fe81f731d22f6bf1cfae767ee4':
  Hardware Composer Commit Points Benchmark

13 years agoMerge "Hardware Composer Commit Points Benchmark" into honeycomb
Louis Huemiller [Sun, 9 Jan 2011 23:43:55 +0000 (15:43 -0800)]
Merge "Hardware Composer Commit Points Benchmark" into honeycomb

13 years agoReturn the View that matches the clicked position.
Romain Guy [Sun, 9 Jan 2011 23:26:13 +0000 (15:26 -0800)]
Return the View that matches the clicked position.
Bug #3323669

Change-Id: If6093885283f962d20bf287ba8b82d7c76f9076c

13 years agoam e03e47b2: am d0b8365f: Return the View that matches the clicked position. Bug...
Romain Guy [Sun, 9 Jan 2011 23:40:52 +0000 (15:40 -0800)]
am e03e47b2: am d0b8365f: Return the View that matches the clicked position. Bug #3323669

* commit 'e03e47b2f37b7c33cd142b9499fad5ea6d5921f8':
  Return the View that matches the clicked position. Bug #3323669

13 years agoam d0b8365f: Return the View that matches the clicked position. Bug #3323669
Romain Guy [Sun, 9 Jan 2011 23:39:14 +0000 (15:39 -0800)]
am d0b8365f: Return the View that matches the clicked position. Bug #3323669

* commit 'd0b8365fcbe891b0bb3b54d345337f60c292d09e':
  Return the View that matches the clicked position. Bug #3323669

13 years agoam 58a64c52: am c211ce24: Merge "Updated dialog and toast assets." into honeycomb
Adam Powell [Sun, 9 Jan 2011 23:27:50 +0000 (15:27 -0800)]
am 58a64c52: am c211ce24: Merge "Updated dialog and toast assets." into honeycomb

* commit '58a64c5247365c0de610f0bb820f302c32e804cd':
  Updated dialog and toast assets.

13 years agoam c211ce24: Merge "Updated dialog and toast assets." into honeycomb
Adam Powell [Sun, 9 Jan 2011 23:26:08 +0000 (15:26 -0800)]
am c211ce24: Merge "Updated dialog and toast assets." into honeycomb

* commit 'c211ce2439b26cfce10b694913ef56272c7f59e9':
  Updated dialog and toast assets.

13 years agoMerge "Updated dialog and toast assets." into honeycomb
Adam Powell [Sun, 9 Jan 2011 23:24:34 +0000 (15:24 -0800)]
Merge "Updated dialog and toast assets." into honeycomb

13 years agoUpdated dialog and toast assets.
Adam Powell [Thu, 6 Jan 2011 07:24:04 +0000 (23:24 -0800)]
Updated dialog and toast assets.

Updated holo alert dialog layouts to use explicit dividers for the title

Change-Id: I2e56c3a782b4c33387032263a509f6b28b2d4686

13 years agoMerge "Updated dialog and toast assets."
Adam Powell [Sun, 9 Jan 2011 23:22:56 +0000 (15:22 -0800)]
Merge "Updated dialog and toast assets."

13 years agoUpdated dialog and toast assets.
Adam Powell [Thu, 6 Jan 2011 07:24:04 +0000 (23:24 -0800)]
Updated dialog and toast assets.

Updated holo alert dialog layouts to use explicit dividers for the title

Change-Id: I43af6d93908a6bab1b41aa82e214ce5b69f7579c

13 years agoam 022f3767: am fcd3e8e6: Merge "Tighten up AsyncTask\'s semantics and behavior....
Romain Guy [Sun, 9 Jan 2011 22:05:07 +0000 (14:05 -0800)]
am 022f3767: am fcd3e8e6: Merge "Tighten up AsyncTask\'s semantics and behavior. Bug #3109366 Bug #3109382" into honeycomb

* commit '022f37672db4cf46f905ef9d50adcb423f55c64e':
  Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382

13 years agoam fcd3e8e6: Merge "Tighten up AsyncTask\'s semantics and behavior. Bug #3109366...
Romain Guy [Sun, 9 Jan 2011 22:03:26 +0000 (14:03 -0800)]
am fcd3e8e6: Merge "Tighten up AsyncTask\'s semantics and behavior. Bug #3109366 Bug #3109382" into honeycomb

* commit 'fcd3e8e6faa5c73d3cf964b765ba3199ff323276':
  Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382

13 years agoam 70ff3085: am ccf9d10b: Merge "Hide and delete some code that should not be public...
Jason Sams [Sun, 9 Jan 2011 22:01:55 +0000 (14:01 -0800)]
am 70ff3085: am ccf9d10b: Merge "Hide and delete some code that should not be public." into honeycomb

* commit '70ff30855ebef67b7b5eef9453022779ddf4c5df':
  Hide and delete some code that should not be public.

13 years agoMerge "Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382"...
Romain Guy [Sun, 9 Jan 2011 22:01:42 +0000 (14:01 -0800)]
Merge "Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382" into honeycomb

13 years agoTighten up AsyncTask's semantics and behavior.
Romain Guy [Sun, 9 Jan 2011 21:53:06 +0000 (13:53 -0800)]
Tighten up AsyncTask's semantics and behavior.
Bug #3109366
Bug #3109382

The new behavior of AsyncTask is the following:
- Unchanged if you don't call cancel()
- If you call cancel():
  - Either onCancelled() *OR* onPostExecute() is invoked
  - onCancelled() is invoked only after doInBackground() finishes

Change-Id: If53faec5890d2fa7098aea76973186a0b1026b39

13 years agoam ccf9d10b: Merge "Hide and delete some code that should not be public." into honeycomb
Jason Sams [Sun, 9 Jan 2011 22:00:22 +0000 (14:00 -0800)]
am ccf9d10b: Merge "Hide and delete some code that should not be public." into honeycomb

* commit 'ccf9d10bd45a98c0004a15690d55aa8259659e40':
  Hide and delete some code that should not be public.

13 years agoMerge "Hide and delete some code that should not be public." into honeycomb
Jason Sams [Sun, 9 Jan 2011 21:58:52 +0000 (13:58 -0800)]
Merge "Hide and delete some code that should not be public." into honeycomb

13 years agoam eb3517fb: (-s ours) am 74ab5119: Merge "DO NOT MERGE Referencing of "r.record...
Dianne Hackborn [Sun, 9 Jan 2011 21:58:49 +0000 (13:58 -0800)]
am eb3517fb: (-s ours) am 74ab5119: Merge "DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null." into honeycomb

* commit 'eb3517fb6c6c2c1444dbd14481404a886a35b9dd':
  DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null.

13 years agoam 74ab5119: Merge "DO NOT MERGE Referencing of "r.record.name" is occured, when...
Dianne Hackborn [Sun, 9 Jan 2011 21:57:19 +0000 (13:57 -0800)]
am 74ab5119: Merge "DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null." into honeycomb

* commit '74ab5119f8a9ba3a2a4ee6f2685c39973651d90a':
  DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null.

13 years agoMerge "DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is...
Dianne Hackborn [Sun, 9 Jan 2011 21:55:56 +0000 (13:55 -0800)]
Merge "DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null." into honeycomb

13 years agoDO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null.
lge-aosp [Fri, 7 Jan 2011 04:45:37 +0000 (13:45 +0900)]
DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null.

Change-Id: I0338c85b562a224d2c478112937fd62d2208e7aa

13 years agoam c50dcea7: (-s ours) am e695bdde: Merge "Fix 3330653: Update lockscreen layouts...
Jim Miller [Sun, 9 Jan 2011 21:51:36 +0000 (13:51 -0800)]
am c50dcea7: (-s ours) am e695bdde: Merge "Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]" into honeycomb

* commit 'c50dcea78c4cfb4df7d74b04ae75c9f35734642f':
  Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]

13 years agoHide and delete some code that should not be public.
Jason Sams [Sun, 9 Jan 2011 21:49:01 +0000 (13:49 -0800)]
Hide and delete some code that should not be public.

Change-Id: Ibe201c235fc81ef1fecb120d6049d6e56222462c

13 years agoam e695bdde: Merge "Fix 3330653: Update lockscreen layouts to match latest mocks...
Jim Miller [Sun, 9 Jan 2011 21:49:04 +0000 (13:49 -0800)]
am e695bdde: Merge "Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]" into honeycomb

* commit 'e695bddefa9a8121e661d2c87ffe0585088a2ebf':
  Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]

13 years agoMerge "Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE...
Jim Miller [Sun, 9 Jan 2011 21:47:29 +0000 (13:47 -0800)]
Merge "Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]" into honeycomb

13 years agoam 7c4f44f5: (-s ours) am febbf6e7: Merge "DO NOT MERGE Fix issue #3333958: Package...
Dianne Hackborn [Sun, 9 Jan 2011 21:29:02 +0000 (13:29 -0800)]
am 7c4f44f5: (-s ours) am febbf6e7: Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think..." into honeycomb

* commit '7c4f44f50f7f0a520452bc526d7a80c1548136c2':
  DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...

13 years agoam 53dd9f34: am 353634a1: Merge "Update progress/seek bar assets. Add indeterminate...
Adam Powell [Sun, 9 Jan 2011 21:27:03 +0000 (13:27 -0800)]
am 53dd9f34: am 353634a1: Merge "Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme." into honeycomb

* commit '53dd9f348be70acb417a522eca8c928ed6c4fee6':
  Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme.

13 years agoam febbf6e7: Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes...
Dianne Hackborn [Sun, 9 Jan 2011 21:26:36 +0000 (13:26 -0800)]
am febbf6e7: Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think..." into honeycomb

* commit 'febbf6e7f87900b479fbed31ab1e0486caeb281d':
  DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...

13 years agoam 353634a1: Merge "Update progress/seek bar assets. Add indeterminate horizontal...
Adam Powell [Sun, 9 Jan 2011 21:24:37 +0000 (13:24 -0800)]
am 353634a1: Merge "Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme." into honeycomb

* commit '353634a1aaf20c974cae390d7fd263ffc9dabe21':
  Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme.

13 years agoMerge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly...
Dianne Hackborn [Sun, 9 Jan 2011 21:24:17 +0000 (13:24 -0800)]
Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think..." into honeycomb

13 years agoFix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]
Jim Miller [Fri, 7 Jan 2011 05:36:17 +0000 (21:36 -0800)]
Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]

This change list:

- simplifies the UI design to reduce the number of
on-screen items by combining Alarm status with the date line.

- updates many of the layout files to match closer to the
final design.

- Simplifies the logic for showing Status1 info. It's now
more predictable and robust.

- updates the layout for tablets

- contains a modified alpha to work well with different backgrounds
(Tested: white, gray, and dark backgrounds)

- updates the tablet icons to something closer to the final size.

Manual merge from Change-Id: Ifb349dfa778e9c91b0649c8d95229607be5af8e5

Change-Id: Ia2a9a2d285102d0208b3a7fcead58d6454d116ae

13 years agoMerge "Update progress/seek bar assets. Add indeterminate horizontal progress bars...
Adam Powell [Sun, 9 Jan 2011 21:22:22 +0000 (13:22 -0800)]
Merge "Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme." into honeycomb

13 years agoUpdate progress/seek bar assets. Add indeterminate horizontal progress
Adam Powell [Sun, 9 Jan 2011 21:08:24 +0000 (13:08 -0800)]
Update progress/seek bar assets. Add indeterminate horizontal progress
bars for holo theme.

Change-Id: I86bb6af1e26727d18b24d5a5378cc9d1b431fc0e

13 years agoDO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...
Dianne Hackborn [Sat, 8 Jan 2011 02:42:59 +0000 (18:42 -0800)]
DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...

...an app is disabled!

Ouch.

Change-Id: I45dc2beef4e413fd447d905632901fadd924cb6e

13 years agoam cfe76038: am 6d175c72: Merge "Merge commit \'690d20bb53ba2485f59d128b365eff991d5cc...
Dianne Hackborn [Sun, 9 Jan 2011 21:11:48 +0000 (13:11 -0800)]
am cfe76038: am 6d175c72: Merge "Merge commit \'690d20bb53ba2485f59d128b365eff991d5cc3e6\' into manualmerge" into honeycomb

* commit 'cfe76038dc476958e19ccccaea29823100199428':
  Fix issue # 3227963: SecurityException: Neither user 10023 nor...

13 years agoam 6d175c72: Merge "Merge commit \'690d20bb53ba2485f59d128b365eff991d5cc3e6\' into...
Dianne Hackborn [Sun, 9 Jan 2011 21:09:24 +0000 (13:09 -0800)]
am 6d175c72: Merge "Merge commit \'690d20bb53ba2485f59d128b365eff991d5cc3e6\' into manualmerge" into honeycomb

* commit '6d175c727e0e671eb9a710b9d1fc8e9d646944e3':
  Fix issue # 3227963: SecurityException: Neither user 10023 nor...

13 years agoMerge "Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge"...
Dianne Hackborn [Sun, 9 Jan 2011 21:07:15 +0000 (13:07 -0800)]
Merge "Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge" into honeycomb

13 years agoMerge "Revert "Propagate new link-status-change message to any NetworkManagementService""
Wink Saville [Sun, 9 Jan 2011 20:48:50 +0000 (12:48 -0800)]
Merge "Revert "Propagate new link-status-change message to any NetworkManagementService""

13 years agoRevert "Propagate new link-status-change message to any NetworkManagementService"
Wink Saville [Sun, 9 Jan 2011 20:16:38 +0000 (12:16 -0800)]
Revert "Propagate new link-status-change message to any NetworkManagementService"

This reverts commit 780dfa42aa8664afa53c30ae669fc0e1f10f6537.

13 years agoam 0a720eeb: am ae34a7cd: Merge "b/3279789 Fixed NPE in CalendarUtils.onQueryComplete...
Michael Chan [Sun, 9 Jan 2011 20:16:22 +0000 (12:16 -0800)]
am 0a720eeb: am ae34a7cd: Merge "b/3279789 Fixed NPE in CalendarUtils.onQueryComplete" into honeycomb

* commit '0a720eeb8b7c4063fe791d7f64ee29693594bbd3':
  b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete

13 years agoam ae34a7cd: Merge "b/3279789 Fixed NPE in CalendarUtils.onQueryComplete" into honeycomb
Michael Chan [Sun, 9 Jan 2011 20:13:57 +0000 (12:13 -0800)]
am ae34a7cd: Merge "b/3279789 Fixed NPE in CalendarUtils.onQueryComplete" into honeycomb

* commit 'ae34a7cd2d65fb89f1d4bffd6316d8b817a45da5':
  b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete

13 years agoMerge "b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryCompl...
Michael Chan [Sun, 9 Jan 2011 20:12:26 +0000 (12:12 -0800)]
Merge "b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete" into honeycomb

13 years agoam 2c4bb992: am fe53015b: Merge "Update default for auto-brightness." into honeycomb
Amith Yamasani [Sun, 9 Jan 2011 20:12:16 +0000 (12:12 -0800)]
am 2c4bb992: am fe53015b: Merge "Update default for auto-brightness." into honeycomb

* commit '2c4bb9921d363820ffb74cdf034445d94befe517':
  Update default for auto-brightness.

13 years agoam f2105d7a: am 6c191768: Merge "Adding comments to the renderscript program classes...
Alex Sakhartchouk [Sun, 9 Jan 2011 20:12:09 +0000 (12:12 -0800)]
am f2105d7a: am 6c191768: Merge "Adding comments to the renderscript program classes." into honeycomb

* commit 'f2105d7a743907cb7415650f4f115243c7bce2d7':
  Adding comments to the renderscript program classes.

13 years agob/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
Michael Chan [Tue, 14 Dec 2010 02:25:08 +0000 (18:25 -0800)]
b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete

Null cursor was returned from query

Change-Id: I76a7d710b0764f52ed6ced23792717feb7b6ae08

13 years agoam fe53015b: Merge "Update default for auto-brightness." into honeycomb
Amith Yamasani [Sun, 9 Jan 2011 20:10:50 +0000 (12:10 -0800)]
am fe53015b: Merge "Update default for auto-brightness." into honeycomb

* commit 'fe53015b0bfe0a26fa62c056b02fdfe399cff904':
  Update default for auto-brightness.

13 years agoam 6c191768: Merge "Adding comments to the renderscript program classes." into honeycomb
Alex Sakhartchouk [Sun, 9 Jan 2011 20:08:44 +0000 (12:08 -0800)]
am 6c191768: Merge "Adding comments to the renderscript program classes." into honeycomb

* commit '6c191768f112d17f926e9b3bf5ed581af7273cb8':
  Adding comments to the renderscript program classes.

13 years agoMerge "Update default for auto-brightness." into honeycomb
Amith Yamasani [Sun, 9 Jan 2011 20:07:17 +0000 (12:07 -0800)]
Merge "Update default for auto-brightness." into honeycomb

13 years agoMerge "Adding comments to the renderscript program classes." into honeycomb
Alex Sakhartchouk [Sun, 9 Jan 2011 20:07:00 +0000 (12:07 -0800)]
Merge "Adding comments to the renderscript program classes." into honeycomb

13 years agoMerge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge
Dianne Hackborn [Sun, 9 Jan 2011 19:59:12 +0000 (11:59 -0800)]
Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge

13 years agoAdding comments to the renderscript program classes.
Alex Sakhartchouk [Sun, 9 Jan 2011 19:34:03 +0000 (11:34 -0800)]
Adding comments to the renderscript program classes.

Change-Id: I989575951df1218c1e753dfa12193d560266bf11

13 years agoam 5af299b2: am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb
Dmitri Plotnikov [Sun, 9 Jan 2011 19:30:59 +0000 (11:30 -0800)]
am 5af299b2: am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb

* commit '5af299b26f252150a9381b7d143cf4b07cde085c':
  Fixed the waitForLoader method.

13 years agoam bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb
Dmitri Plotnikov [Sun, 9 Jan 2011 19:29:19 +0000 (11:29 -0800)]
am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb

* commit 'bdd8d17d81c4ef41a2ae82c7f73ecff6b48f493e':
  Fixed the waitForLoader method.

13 years agoMerge "Fixed the waitForLoader method." into honeycomb
Dmitri Plotnikov [Sun, 9 Jan 2011 19:27:25 +0000 (11:27 -0800)]
Merge "Fixed the waitForLoader method." into honeycomb

13 years agoam 6721adb6: am 894f0e4c: Merge "LayoutLib: add a few misc implementations." into...
Xavier Ducrohet [Sun, 9 Jan 2011 19:08:40 +0000 (11:08 -0800)]
am 6721adb6: am 894f0e4c: Merge "LayoutLib: add a few misc implementations." into honeycomb

* commit '6721adb67d6957f3dc886192eacac3f9be0d1091':
  LayoutLib: add a few misc implementations.

13 years agoam 03e497e9: am 00407dd6: Merge "LayoutLib: finish Typeface and unload them in dispos...
Xavier Ducrohet [Sun, 9 Jan 2011 19:08:37 +0000 (11:08 -0800)]
am 03e497e9: am 00407dd6: Merge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb

* commit '03e497e90bd7f64d119dc53c7cebb5f2f1d1c9dd':
  LayoutLib: finish Typeface and unload them in dispose.

13 years agoam 05e3ea1f: am ac736d3a: Merge "LayoutLib: remove fade in/out transition on moveChil...
Xavier Ducrohet [Sun, 9 Jan 2011 19:08:34 +0000 (11:08 -0800)]
am 05e3ea1f: am ac736d3a: Merge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb

* commit '05e3ea1f1ec0d08dc5bc44763a0cfdc1351a601c':
  LayoutLib: remove fade in/out transition on moveChild.

13 years agoam 894f0e4c: Merge "LayoutLib: add a few misc implementations." into honeycomb
Xavier Ducrohet [Sun, 9 Jan 2011 19:06:58 +0000 (11:06 -0800)]
am 894f0e4c: Merge "LayoutLib: add a few misc implementations." into honeycomb

* commit '894f0e4c68f68ae06d7bab504284517af63852c8':
  LayoutLib: add a few misc implementations.

13 years agoam 00407dd6: Merge "LayoutLib: finish Typeface and unload them in dispose." into...
Xavier Ducrohet [Sun, 9 Jan 2011 19:06:54 +0000 (11:06 -0800)]
am 00407dd6: Merge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb

* commit '00407dd6d469fa8dea008132179d2828dea49c75':
  LayoutLib: finish Typeface and unload them in dispose.

13 years agoam ac736d3a: Merge "LayoutLib: remove fade in/out transition on moveChild." into...
Xavier Ducrohet [Sun, 9 Jan 2011 19:06:51 +0000 (11:06 -0800)]
am ac736d3a: Merge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb

* commit 'ac736d3a7915becda5d7366f440aab99972e6b64':
  LayoutLib: remove fade in/out transition on moveChild.

13 years agoFixed the waitForLoader method.
Dmitri Plotnikov [Sun, 9 Jan 2011 19:05:50 +0000 (11:05 -0800)]
Fixed the waitForLoader method.

The reason we need a separate latch is that
AsyncTask will post onPostExecute/onCancelled
_after_ executing mFuture.get().  The previous
implementation would only wait for mFuture.get()
to complete and not the entire task.

Change-Id: I96964591980965148eb09af38b5838bfa5d28277

13 years agoMerge "LayoutLib: add a few misc implementations." into honeycomb
Xavier Ducrohet [Sun, 9 Jan 2011 19:05:23 +0000 (11:05 -0800)]
Merge "LayoutLib: add a few misc implementations." into honeycomb

13 years agoMerge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb
Xavier Ducrohet [Sun, 9 Jan 2011 19:05:20 +0000 (11:05 -0800)]
Merge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb

13 years agoMerge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb
Xavier Ducrohet [Sun, 9 Jan 2011 19:05:15 +0000 (11:05 -0800)]
Merge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb

13 years agoHardware Composer Commit Points Benchmark
Louis Huemiller [Sun, 9 Jan 2011 18:59:31 +0000 (10:59 -0800)]
Hardware Composer Commit Points Benchmark

Change-Id: Ie997d13559c0e4e9dc3babfe92ca1acacef2a549

13 years agoam 3ecf835e: am 2954cd91: Add start/endTransition events for CHANGE transitions
Chet Haase [Sun, 9 Jan 2011 18:17:36 +0000 (10:17 -0800)]
am 3ecf835e: am 2954cd91: Add start/endTransition events for CHANGE transitions

* commit '3ecf835e95378bdb98247bb036b78d9c22473d5e':
  Add start/endTransition events for CHANGE transitions

13 years agoam 2954cd91: Add start/endTransition events for CHANGE transitions
Chet Haase [Sun, 9 Jan 2011 18:16:09 +0000 (10:16 -0800)]
am 2954cd91: Add start/endTransition events for CHANGE transitions

* commit '2954cd91ab1fef14c8aed5173c160ce00558cd3a':
  Add start/endTransition events for CHANGE transitions

13 years agoAdd start/endTransition events for CHANGE transitions
Chet Haase [Sun, 9 Jan 2011 17:43:39 +0000 (09:43 -0800)]
Add start/endTransition events for CHANGE transitions

There was already a mechanism for sending out events for LayoutTransition
when animations started or ended, but the implementation only sent out events
for the appearing/disappearing animations. This fix provides callbacks to
listeners for the CHANGE_APPEARING and CHANGE_DISAPPEARING transitions, too.

Change-Id: Icfb8cc1c20d2df3e4a817255e96c9d0e94c1d8c4

13 years agoam a657f113: am b0512c37: Merge "Fix check for required features" into honeycomb
Kenny Root [Sun, 9 Jan 2011 15:19:28 +0000 (07:19 -0800)]
am a657f113: am b0512c37: Merge "Fix check for required features" into honeycomb

* commit 'a657f113971be0903c16f3b475db4150be84a357':
  Fix check for required features

13 years agoam b0512c37: Merge "Fix check for required features" into honeycomb
Kenny Root [Sun, 9 Jan 2011 15:16:50 +0000 (07:16 -0800)]
am b0512c37: Merge "Fix check for required features" into honeycomb

* commit 'b0512c372587f366f0b0bd859b22a344a5d5a520':
  Fix check for required features

13 years agoMerge "Fix check for required features" into honeycomb
Kenny Root [Sun, 9 Jan 2011 15:15:26 +0000 (07:15 -0800)]
Merge "Fix check for required features" into honeycomb