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
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
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
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
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
Chet Haase
42363c71c4
am 3ecf835e: am 2954cd91: Add start/endTransition events for CHANGE transitions
...
* commit '3ecf835e95378bdb98247bb036b78d9c22473d5e':
Add start/endTransition events for CHANGE transitions
2011-01-09 10:17:36 -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
Chet Haase
2954cd91ab
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
2011-01-09 09:43:39 -08:00
Kenny Root
ac31de0cb1
am a657f113: am b0512c37: Merge "Fix check for required features" into honeycomb
...
* commit 'a657f113971be0903c16f3b475db4150be84a357':
Fix check for required features
2011-01-09 07:19:28 -08:00
Kenny Root
a657f11397
am b0512c37: Merge "Fix check for required features" into honeycomb
...
* commit 'b0512c372587f366f0b0bd859b22a344a5d5a520':
Fix check for required features
2011-01-09 07:16:50 -08:00
Kenny Root
b0512c3725
Merge "Fix check for required features" into honeycomb
2011-01-09 07:15:26 -08:00
Dianne Hackborn
7079ef0824
am 5ef0a153: am 247fe74c: Implement issue # 3255887 could CursorLoader offer...
...
* commit '5ef0a153f01362a3263d3cd608ece09cc67377df':
Implement issue # 3255887 could CursorLoader offer...
2011-01-08 18:29:19 -08:00
Dianne Hackborn
5ef0a153f0
am 247fe74c: Implement issue # 3255887 could CursorLoader offer...
...
* commit '247fe74c934cb3fba85aae7e051a8044f460fb11':
Implement issue # 3255887 could CursorLoader offer...
2011-01-08 18:27:24 -08:00
Dianne Hackborn
247fe74c93
Implement issue # 3255887 could CursorLoader offer...
...
...to throttle contentobserver-based requeries
Why yes, I guess it could.
This also reworks AsyncTaskLoader to not generate multiple
concurrent tasks if it is getting change notifications before
the last background task is complete.
And removes some of the old APIs that had been deprecated but
need to be gone for final release.
And fixes a few little problems with applying the wrong theme
in system code.
Change-Id: Ic7a665b666d0fb9d348e5f23595532191065884f
2011-01-08 18:25:30 -08:00
Adam Powell
f5473d03ae
am 34a4aeed: am f600780b: Merge "Remove unnecessary log" into honeycomb
...
* commit '34a4aeed9920ef3867c783ab567df87b87f6a9a0':
Remove unnecessary log
2011-01-08 17:33:37 -08:00
Adam Powell
34a4aeed99
am f600780b: Merge "Remove unnecessary log" into honeycomb
...
* commit 'f600780bea864c672e01a391b65da65d85045803':
Remove unnecessary log
2011-01-08 17:31:37 -08:00
Adam Powell
f600780bea
Merge "Remove unnecessary log" into honeycomb
2011-01-08 17:30:07 -08:00
Adam Powell
1ab74be06c
Remove unnecessary log
...
Change-Id: I6bb267d7d5f82ae9e1cbe6b022b722ccedc428fd
2011-01-08 17:29:22 -08:00
Adam Powell
44d2ab2191
am 9861973c: am 2b6be701: Fix bug 3312807 - Fix child margin measurement in FrameLayout
...
* commit '9861973c0beba15ee216e88bda7723cb01b02d63':
Fix bug 3312807 - Fix child margin measurement in FrameLayout
2011-01-08 17:01:21 -08:00
Adam Powell
9861973c0b
am 2b6be701: Fix bug 3312807 - Fix child margin measurement in FrameLayout
...
* commit '2b6be701a90a4f0aefefcf8e70feb04722e1bcfe':
Fix bug 3312807 - Fix child margin measurement in FrameLayout
2011-01-08 16:59:06 -08:00
Adam Powell
2b6be701a9
Fix bug 3312807 - Fix child margin measurement in FrameLayout
...
Change-Id: I5166d7b2d283c577d5f95a15b1626b068cfa6bc6
2011-01-08 16:44:07 -08:00
Adam Powell
6feb4bcd66
am 033553c2: am 00bba682: Amendment to fix for bug 3332414
...
* commit '033553c294169f505720393aa707d14f2e6c3399':
Amendment to fix for bug 3332414
2011-01-08 16:44:03 -08:00
Adam Powell
c6c9756d7f
am c73af594: am d1af7720: Merge "Bug 3332414 - UI glitch in CAB options" into honeycomb
...
* commit 'c73af594b01b58e59944fbc1e8c4fb91081f99de':
Bug 3332414 - UI glitch in CAB options
2011-01-08 16:43:59 -08:00
Adam Powell
033553c294
am 00bba682: Amendment to fix for bug 3332414
...
* commit '00bba682efedbe121f31c98697f91101b1c22b82':
Amendment to fix for bug 3332414
2011-01-08 15:55:59 -08:00
Adam Powell
00bba682ef
Amendment to fix for bug 3332414
...
Change-Id: Id3047f6ea6f8f5c68318057798e285cc1e06d094
2011-01-08 15:53:38 -08:00
Adam Powell
c73af594b0
am d1af7720: Merge "Bug 3332414 - UI glitch in CAB options" into honeycomb
...
* commit 'd1af77207c5c17b55aea78174633539b73abcf89':
Bug 3332414 - UI glitch in CAB options
2011-01-08 15:28:41 -08:00
Adam Powell
dd10b66601
Bug 3332414 - UI glitch in CAB options
...
Change-Id: Ic066f968b0125276c315f31adbd96420e528362f
2011-01-08 15:17:30 -08:00
Adam Powell
f967d0490a
am ccc837e3: am 2ebac694: Fix bug 3334437 - require an adapter to measure dropdown content width
...
* commit 'ccc837e3d4bf6478904ee5f8628219e137415a48':
Fix bug 3334437 - require an adapter to measure dropdown content width
2011-01-08 14:09:10 -08:00
Adam Powell
ccc837e3d4
am 2ebac694: Fix bug 3334437 - require an adapter to measure dropdown content width
...
* commit '2ebac69419c5ae9b439178424482ae5ffd3a7e0c':
Fix bug 3334437 - require an adapter to measure dropdown content width
2011-01-08 14:07:07 -08:00
Adam Powell
2ebac69419
Fix bug 3334437 - require an adapter to measure dropdown content width
...
Change-Id: I357a2db66db121816091921e47708140958ad507
2011-01-08 13:58:29 -08:00
Adam Powell
dfcd15b1aa
am 6de1301b: am 947f7824: Fix bug 3245465 - Themed dialog icons
...
* commit '6de1301b492a1d8450fa61fcff6a3e34437b8891':
Fix bug 3245465 - Themed dialog icons
2011-01-08 13:24:49 -08:00
Adam Powell
6de1301b49
am 947f7824: Fix bug 3245465 - Themed dialog icons
...
* commit '947f7824118f0e9b642df8760a8725a7eda59318':
Fix bug 3245465 - Themed dialog icons
2011-01-08 13:22:47 -08:00
Dianne Hackborn
81741147a8
am 4bc6bb85: am 97b0b7bb: am 3ea5728e: Tweak level at which we reset battery stats to 90%.
...
* commit '4bc6bb85df4f3d9ebf3d04ecad16aef3307c508f':
Tweak level at which we reset battery stats to 90%.
2011-01-08 13:15:41 -08:00
Adam Powell
947f782411
Fix bug 3245465 - Themed dialog icons
...
Added light/dark versions of holo dialog icons. Apps using
AlertDialogs that wish to use the system dialog icon should use
setIconAttribute(android.R.attr.alertDialogIcon) instead of
setIcon(android.R.drawable.ic_alert_dialog).
Change-Id: I40793a3164478be5ffa045ededfcab8210753a4b
2011-01-08 13:09:51 -08:00
Dianne Hackborn
4bc6bb85df
am 97b0b7bb: am 3ea5728e: Tweak level at which we reset battery stats to 90%.
...
* commit '97b0b7bbd41bf3bc6095a513c329e1143300ec3a':
Tweak level at which we reset battery stats to 90%.
2011-01-08 06:49:05 -08:00
Jamie Gennis
37c45fa415
am fd6f39e1: Enable camera preview to a SurfaceTexture.
...
* commit 'fd6f39e147dc077139a41b9c2a4039fbaa20224e':
Enable camera preview to a SurfaceTexture.
2011-01-08 04:40:19 -08:00
Adam Powell
99dd7f1374
am b5e18555: Merge "Fix bug 3200615 - "MenuPopupHelper cannot be used without an anchor"" into honeycomb
...
* commit 'b5e18555d61a3a1ed0715230b8e0084daec9eba8':
Fix bug 3200615 - "MenuPopupHelper cannot be used without an anchor"
2011-01-08 04:40:04 -08:00
Michael Chan
cb588ccdd6
Merge "b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete"
2011-01-07 18:13:48 -08:00
Jamie Gennis
fd6f39e147
Enable camera preview to a SurfaceTexture.
...
This change adds a public Java API to use a SurfaceTexture as the
destination of camera preview frames.
Change-Id: If537fed2df12c5c181e2af5f817985c1bda853fb
2011-01-07 17:40:24 -08:00
Adam Powell
b5e18555d6
Merge "Fix bug 3200615 - "MenuPopupHelper cannot be used without an anchor"" into honeycomb
2011-01-07 17:27:19 -08:00