39071 Commits

Author SHA1 Message Date
Jim Miller
b3a82ebd6e 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
2011-01-09 16:10:19 -08:00
Jim Miller
730f0b238a Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb 2011-01-09 16:08:58 -08:00
Jim Miller
81f9b286d1 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
2011-01-09 16:03:27 -08:00
Louis Huemiller
0010e80304 am edca0e4d: Merge "Hardware Composer Commit Points Benchmark" into honeycomb
* commit 'edca0e4d134610fe81f731d22f6bf1cfae767ee4':
  Hardware Composer Commit Points Benchmark
2011-01-09 15:45:25 -08:00
Louis Huemiller
edca0e4d13 Merge "Hardware Composer Commit Points Benchmark" into honeycomb 2011-01-09 15:43:55 -08:00
Romain Guy
d0b8365fcb Return the View that matches the clicked position.
Bug #3323669

Change-Id: If6093885283f962d20bf287ba8b82d7c76f9076c
2011-01-09 15:41:04 -08:00
Romain Guy
e03e47b2f3 am d0b8365f: Return the View that matches the clicked position. Bug #3323669
* commit 'd0b8365fcbe891b0bb3b54d345337f60c292d09e':
  Return the View that matches the clicked position. Bug #3323669
2011-01-09 15:39:14 -08:00
Adam Powell
58a64c5247 am c211ce24: Merge "Updated dialog and toast assets." into honeycomb
* commit 'c211ce2439b26cfce10b694913ef56272c7f59e9':
  Updated dialog and toast assets.
2011-01-09 15:26:08 -08:00
Adam Powell
c211ce2439 Merge "Updated dialog and toast assets." into honeycomb 2011-01-09 15:24:34 -08:00
Adam Powell
463c70014d Updated dialog and toast assets.
Updated holo alert dialog layouts to use explicit dividers for the title

Change-Id: I2e56c3a782b4c33387032263a509f6b28b2d4686
2011-01-09 15:23:54 -08:00
Romain Guy
022f37672d 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
2011-01-09 14:03:26 -08:00
Romain Guy
fcd3e8e6fa Merge "Tighten up AsyncTask's semantics and behavior. Bug #3109366 Bug #3109382" into honeycomb 2011-01-09 14:01:42 -08:00
Romain Guy
e95003e4a1 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
2011-01-09 14:04:36 -08:00
Jason Sams
70ff30855e 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.
2011-01-09 14:00:22 -08:00
Jason Sams
ccf9d10bd4 Merge "Hide and delete some code that should not be public." into honeycomb 2011-01-09 13:58:52 -08:00
Dianne Hackborn
eb3517fb6c 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.
2011-01-09 13:57:19 -08:00
Dianne Hackborn
74ab5119f8 Merge "DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null." into honeycomb 2011-01-09 13:55:56 -08:00
lge-aosp
ea278a945a DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null.
Change-Id: I0338c85b562a224d2c478112937fd62d2208e7aa
2011-01-09 13:54:53 -08:00
Jason Sams
67e3d206ca Hide and delete some code that should not be public.
Change-Id: Ibe201c235fc81ef1fecb120d6049d6e56222462c
2011-01-09 13:49:31 -08:00
Jim Miller
c50dcea78c 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]
2011-01-09 13:49:04 -08:00
Jim Miller
e695bddefa Merge "Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]" into honeycomb 2011-01-09 13:47:29 -08:00
Dianne Hackborn
7c4f44f50f 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...
2011-01-09 13:26:36 -08:00
Adam Powell
53dd9f348b 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.
2011-01-09 13:24:37 -08:00
Dianne Hackborn
febbf6e7f8 Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think..." into honeycomb 2011-01-09 13:24:17 -08:00
Jim Miller
b450a65c1c 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
2011-01-09 13:24:00 -08:00
Adam Powell
353634a1aa Merge "Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme." into honeycomb 2011-01-09 13:22:22 -08:00
Adam Powell
a50ff3847e Update progress/seek bar assets. Add indeterminate horizontal progress
bars for holo theme.

Change-Id: I86bb6af1e26727d18b24d5a5378cc9d1b431fc0e
2011-01-09 13:21:30 -08:00
Dianne Hackborn
1f22d2a31a DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...
...an app is disabled!

Ouch.

Change-Id: I45dc2beef4e413fd447d905632901fadd924cb6e
2011-01-09 13:15:30 -08:00
Dianne Hackborn
cfe76038dc am 6d175c72: Merge "Merge commit \'690d20bb53ba2485f59d128b365eff991d5cc3e6\' into manualmerge" into honeycomb
* commit '6d175c727e0e671eb9a710b9d1fc8e9d646944e3':
  Fix issue # 3227963: SecurityException: Neither user 10023 nor...
2011-01-09 13:09:24 -08:00
Dianne Hackborn
6d175c727e Merge "Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge" into honeycomb 2011-01-09 13:07:15 -08:00
Michael Chan
0a720eeb8b am ae34a7cd: Merge "b/3279789 Fixed NPE in CalendarUtils.onQueryComplete" into honeycomb
* commit 'ae34a7cd2d65fb89f1d4bffd6316d8b817a45da5':
  b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
2011-01-09 12:13:57 -08:00
Michael Chan
ae34a7cd2d Merge "b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete" into honeycomb 2011-01-09 12:12:26 -08:00
Michael Chan
aa5bb98120 b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
Null cursor was returned from query

Change-Id: I76a7d710b0764f52ed6ced23792717feb7b6ae08
2011-01-09 12:11:02 -08:00
Amith Yamasani
2c4bb9921d am fe53015b: Merge "Update default for auto-brightness." into honeycomb
* commit 'fe53015b0bfe0a26fa62c056b02fdfe399cff904':
  Update default for auto-brightness.
2011-01-09 12:10:50 -08:00
Alex Sakhartchouk
f2105d7a74 am 6c191768: Merge "Adding comments to the renderscript program classes." into honeycomb
* commit '6c191768f112d17f926e9b3bf5ed581af7273cb8':
  Adding comments to the renderscript program classes.
2011-01-09 12:08:44 -08:00
Amith Yamasani
fe53015b0b Merge "Update default for auto-brightness." into honeycomb 2011-01-09 12:07:17 -08:00
Alex Sakhartchouk
6c191768f1 Merge "Adding comments to the renderscript program classes." into honeycomb 2011-01-09 12:07:00 -08:00
Dianne Hackborn
4f05220d10 Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge 2011-01-09 11:59:12 -08:00
Alex Sakhartchouk
df27202deb Adding comments to the renderscript program classes.
Change-Id: I989575951df1218c1e753dfa12193d560266bf11
2011-01-09 11:34:03 -08:00
Dmitri Plotnikov
5af299b26f am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb
* commit 'bdd8d17d81c4ef41a2ae82c7f73ecff6b48f493e':
  Fixed the waitForLoader method.
2011-01-09 11:29:19 -08:00
Dmitri Plotnikov
bdd8d17d81 Merge "Fixed the waitForLoader method." into honeycomb 2011-01-09 11:27:25 -08:00
Xavier Ducrohet
6721adb67d am 894f0e4c: Merge "LayoutLib: add a few misc implementations." into honeycomb
* commit '894f0e4c68f68ae06d7bab504284517af63852c8':
  LayoutLib: add a few misc implementations.
2011-01-09 11:06:58 -08:00
Xavier Ducrohet
03e497e90b am 00407dd6: Merge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb
* commit '00407dd6d469fa8dea008132179d2828dea49c75':
  LayoutLib: finish Typeface and unload them in dispose.
2011-01-09 11:06:54 -08:00
Xavier Ducrohet
05e3ea1f1e am ac736d3a: Merge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb
* commit 'ac736d3a7915becda5d7366f440aab99972e6b64':
  LayoutLib: remove fade in/out transition on moveChild.
2011-01-09 11:06:51 -08:00
Dmitri Plotnikov
59d8edd09d 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
2011-01-09 11:05:50 -08:00
Xavier Ducrohet
894f0e4c68 Merge "LayoutLib: add a few misc implementations." into honeycomb 2011-01-09 11:05:23 -08:00
Xavier Ducrohet
00407dd6d4 Merge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb 2011-01-09 11:05:20 -08:00
Xavier Ducrohet
ac736d3a79 Merge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb 2011-01-09 11:05:15 -08:00
Louis Huemiller
585cd4f78c Hardware Composer Commit Points Benchmark
Change-Id: Ie997d13559c0e4e9dc3babfe92ca1acacef2a549
2011-01-09 10:59:31 -08:00
Chet Haase
3ecf835e95 am 2954cd91: Add start/endTransition events for CHANGE transitions
* commit '2954cd91ab1fef14c8aed5173c160ce00558cd3a':
  Add start/endTransition events for CHANGE transitions
2011-01-09 10:16:09 -08:00