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
86da64f69a
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.
2011-01-09 13:58:49 -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
Jim Miller
ffd221e57e
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]
2011-01-09 13:51:36 -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
e953c23825
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...
2011-01-09 13:29:02 -08:00
Adam Powell
cffec6f72d
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.
2011-01-09 13:27:03 -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
a64b01f9ea
am cfe76038: am 6d175c72: Merge "Merge commit \'690d20bb53ba2485f59d128b365eff991d5cc3e6\' into manualmerge" into honeycomb
...
* commit 'cfe76038dc476958e19ccccaea29823100199428':
Fix issue # 3227963: SecurityException: Neither user 10023 nor...
2011-01-09 13:11:48 -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
Wink Saville
31144e26c0
Merge "Revert "Propagate new link-status-change message to any NetworkManagementService""
2011-01-09 12:48:50 -08:00
Wink Saville
1a7e671902
Revert "Propagate new link-status-change message to any NetworkManagementService"
...
This reverts commit 780dfa42aa8664afa53c30ae669fc0e1f10f6537.
2011-01-09 12:16:38 -08:00
Michael Chan
da7ad0b491
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
2011-01-09 12:16:22 -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
Amith Yamasani
ae8ff72671
am 2c4bb992: am fe53015b: Merge "Update default for auto-brightness." into honeycomb
...
* commit '2c4bb9921d363820ffb74cdf034445d94befe517':
Update default for auto-brightness.
2011-01-09 12:12:16 -08:00
Alex Sakhartchouk
817d753eac
am f2105d7a: am 6c191768: Merge "Adding comments to the renderscript program classes." into honeycomb
...
* commit 'f2105d7a743907cb7415650f4f115243c7bce2d7':
Adding comments to the renderscript program classes.
2011-01-09 12:12:09 -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
0142de5972
am 5af299b2: am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb
...
* commit '5af299b26f252150a9381b7d143cf4b07cde085c':
Fixed the waitForLoader method.
2011-01-09 11:30:59 -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
b3bc42dafa
am 6721adb6: am 894f0e4c: Merge "LayoutLib: add a few misc implementations." into honeycomb
...
* commit '6721adb67d6957f3dc886192eacac3f9be0d1091':
LayoutLib: add a few misc implementations.
2011-01-09 11:08:40 -08:00
Xavier Ducrohet
732769d1f8
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.
2011-01-09 11:08:37 -08:00
Xavier Ducrohet
aea6602cef
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.
2011-01-09 11:08:34 -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