Mathias Agopian
e0dfee2b70
Merge "Fix the ISurfaceComposer onTransact switch."
2011-01-16 17:31:42 -08:00
Patrick Dubroy
c01475318e
am e7218240: Merge "Add a method for clearing all animations on a thread." into honeycomb
...
* commit 'e7218240ab1e52de0f7d16c72b0a5b87679427a1':
Add a method for clearing all animations on a thread.
2011-01-16 17:31:35 -08:00
Adam Powell
4b8bb8b01a
am 70359ce2: Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb
...
* commit '70359ce27d39222ef023078e5a461aee28bb7be1':
Fix bug 3050138 - Action bar does not display correctly when many action items are added
2011-01-16 17:31:32 -08:00
Mathias Agopian
d13ff8de1a
am 8a852406: Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb
...
* commit '8a852406428ea283fef1c860bc13cb5b5bfbc7ac':
Add logs when taking a screenshot to help tracking issue 3361121
2011-01-16 17:29:29 -08:00
Jamie Gennis
376590d668
Implement SurfaceTexture frame-available callback.
...
This change implements the onFrameAvailable callback for the
SurfaceTexture java class. It includes the C++ SurfaceTexture code as
well as the JNI and Java code to enable the callback.
Change-Id: Ifd8b8e7ad46ee70cba6da1c2e96dab8045d1ea30
2011-01-16 17:28:39 -08:00
Patrick Dubroy
e7218240ab
Merge "Add a method for clearing all animations on a thread." into honeycomb
2011-01-16 17:28:11 -08:00
Adam Powell
70359ce27d
Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb
2011-01-16 17:28:05 -08:00
Mathias Agopian
8a85240642
Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb
2011-01-16 17:26:30 -08:00
Mathias Agopian
cd2cfb6a15
Add logs when taking a screenshot to help tracking issue 3361121
...
Change-Id: I61d1e072ebe7061ee1d7255f6121b684e2923d1b
2011-01-16 17:25:26 -08:00
Adam Powell
36fced9b21
Fix bug 3050138 - Action bar does not display correctly when many
...
action items are added
Rules for action bar overflow:
Items are considered for inclusion in the order specified within the
menu. There is a limit of a total count, optionally including the
overflow menu button itself. This is a soft limit; if an item shares a
group ID with an item previously included as an action item, the new
item will stay with its group and become an action item itself even if
it breaks the max item count limit. This is done to limit the
conceptual complexity of the items presented within an action
bar. Only a few unrelated concepts should be presented to the user in
this space, and groups are treated as a single concept.
There is also a hard limit of consumed measurable space. This limit
may be broken by a single item that exceeds the remaining space, but
no further items may be added. If an item that is part of a group
cannot fit within the remaining measured width, the entire group will
be demoted to overflow. This is done to ensure room for navigation and
other affordances in the action bar as well as reduce general UI
clutter.
The space freed by demoting a full group cannot be consumed by future
menu items. Once items begin to overflow, all future items become
overflow items as well. This is to avoid inadvertent reordering that
may break the app's intended design.
Change-Id: I878f6b15619059258c91c01f4fe838feac161d6d
2011-01-16 17:20:23 -08:00
Amith Yamasani
e494662c99
Add back legacy layout for preference framework for compatibility.
...
Bug: 3184831
Copied holo layouts to *_holo.xml and restored the old layouts for
non-holo (pre-honeycomb) apps to use so that their layout assumptions
aren't messed up.
Change-Id: If4dcef16191a47a4b101da6bfb0c2df1757d1ae4
2011-01-16 17:19:08 -08:00
Patrick Dubroy
8901ffab29
Add a method for clearing all animations on a thread.
2011-01-16 17:15:28 -08:00
Adam Cohen
760534a68a
am 67e8915c: Merge "Fixing StackView bugs:" into honeycomb
...
* commit '67e8915c94b4e841c80ce034c212d4f0cf9a5098':
Fixing StackView bugs:
2011-01-16 17:10:22 -08:00
Adam Cohen
67e8915c94
Merge "Fixing StackView bugs:" into honeycomb
2011-01-16 17:08:40 -08:00
Adam Cohen
c99ff7390d
Fixing StackView bugs:
...
-> Single item in loop mode (Issue: 3290092)
-> ITEMS_SLIDE_UP compatibility (Issue: 3134989)
Change-Id: I7fb662c388bfa57c7837a8a5225d33d839aed404
2011-01-16 17:07:55 -08:00
Joe Onorato
85e700ca2e
am 08a555ba: Merge "Remove a bunch of logging." into honeycomb
...
* commit '08a555bac48d8192be2b052bcf2ac4090476612e':
Remove a bunch of logging.
2011-01-16 17:03:20 -08:00
Joe Onorato
08a555bac4
Merge "Remove a bunch of logging." into honeycomb
2011-01-16 17:01:14 -08:00
Joe Onorato
f68b500bb0
Remove a bunch of logging.
...
Change-Id: I81a9a5d94b1652133d7b1700da55f982038f6b56
2011-01-16 17:00:34 -08:00
Kenny Root
d259468fe9
am fc28f412: Merge "Put externalSize measurements in PackageStats" into honeycomb
...
* commit 'fc28f412b54d811c61d4997ea94c79875f9ad015':
Put externalSize measurements in PackageStats
2011-01-16 16:59:24 -08:00
Jeff Brown
04970d654d
am 3392b8e2: am 4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread
...
* commit '3392b8e23e7eb0275071af621802ed04c829c911':
Flush Binder commands in ndk looper.
2011-01-16 16:58:57 -08:00
Kenny Root
fc28f412b5
Merge "Put externalSize measurements in PackageStats" into honeycomb
2011-01-16 16:56:44 -08:00
Santosh Madhava
9bcedf7cf3
Video editor API update - rework for Patch Set 3
...
Change-Id: I75bfa17fe98bec13f672ff9a4edf623bb85020c8
2011-01-16 16:56:12 -08:00
Jim Miller
3530ebe451
resolved conflicts for merge of 578e73da to honeycomb-plus-aosp
...
Change-Id: I334ae5382220a84881521885b6e3c3991fd8bbb0
2011-01-16 16:55:28 -08:00
Dharmaray Kundargi
3b3cddccc1
integrate videoeditor preview player.
...
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
2011-01-16 16:43:20 -08:00
Jamie Gennis
0fb736c093
Fix SurfaceTexture transform matrix.
...
Change-Id: I31520c547cafa5cc85cd0f73883ab3a9ff4648e2
2011-01-16 16:35:01 -08:00
Kenny Root
366949c2d9
Put externalSize measurements in PackageStats
...
When measuring a package's usage, put the external size in the
PackageStats as well. This will allow programs using a lot of space on
the external card to be held accountable.
Bug: 3308791
Change-Id: If2df07bdbf6ffb31577074fad8f4a87ca4e89086
2011-01-16 16:21:15 -08:00
Jeff Brown
3392b8e23e
am 4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread
...
* commit '4a2e478a5bf6b4650181d1dfa643eadcc387fcec':
Flush Binder commands in ndk looper.
2011-01-16 16:19:00 -08:00
Jim Miller
578e73dac8
am 6687ecb4: Merge "Fix 3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
...
* commit '6687ecb447025a1c56253d0fd67ad30af070db17':
Fix 3106227: use WeakReferences for receivers in DigitalClock class
2011-01-16 16:16:57 -08:00
Jeff Brown
4a2e478a5b
Merge "Flush Binder commands in ndk looper." into gingerbread
2011-01-16 16:15:32 -08:00
Jim Miller
6687ecb447
Merge "Fix 3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
2011-01-16 16:14:52 -08:00
Jason Sams
b97b251c26
Add error checks to the copyFrom functions.
...
Change-Id: Iac064c52eb58b05a94fa1c432304c6216256555b
2011-01-16 16:11:42 -08:00
Jason Sams
300406abd4
Add some error checking.
...
Change-Id: I007b1429a64b39ffd5cdef200c295d5a31f95048
2011-01-16 16:11:42 -08:00
Jason Sams
4e7a9feae2
am 981df1d9: Merge "unhide functions used by reflected files for SDK." into honeycomb
...
* commit '981df1d9931c1bd48dbb735437823b92db51e1a1':
unhide functions used by reflected files for SDK.
2011-01-16 16:11:22 -08:00
David 'Digit' Turner
e2a5e86c9f
SystemServer: Do not register null BlueTooth service in the emulator
...
Because registering a null service generates an exception. See bug 3356000
Change-Id: Id7b4af815942e498d750c1b7a412d5ee26b61ad4
2011-01-17 01:10:21 +01:00
Jim Miller
76e7533564
am 1f6e37ef: Merge "Fix 3355957: Don\'t hide the keyboard for PIN/Password" into honeycomb
...
* commit '1f6e37efecb0f5e9a4b5f7ee90b24740f6e02d1a':
Fix 3355957: Don't hide the keyboard for PIN/Password
2011-01-16 16:09:11 -08:00
Jason Sams
981df1d993
Merge "unhide functions used by reflected files for SDK." into honeycomb
2011-01-16 16:08:41 -08:00
Jim Miller
1f6e37efec
Merge "Fix 3355957: Don't hide the keyboard for PIN/Password" into honeycomb
2011-01-16 16:06:51 -08:00
Irfan Sheriff
4ef326602a
am 6374d7e2: Merge "Report WPS overlap error" into honeycomb
...
* commit '6374d7e2e0b55872cc7194484c1a4496b4039853':
Report WPS overlap error
2011-01-16 15:53:51 -08:00
Robert Greenwalt
212c63bc61
Merge "Moving gsm.NetworkInfo to OperatorInfo"
2011-01-16 15:53:37 -08:00
Irfan Sheriff
6374d7e2e0
Merge "Report WPS overlap error" into honeycomb
2011-01-16 15:52:05 -08:00
Jim Miller
b47bed9c48
Fix 3355957: Don't hide the keyboard for PIN/Password
...
BT or USB keyboards currently cause the on-screen keyboard to
be hidden. This will probably need to be refactored in the
future but the change is too complicated for the current
release.
Change-Id: Ieb655b85622f7c174ed4a5d1c3766d130a9d32f1
2011-01-16 15:48:54 -08:00
Shih-wei Liao
f98f2b6bc6
am 077fd5f6: Merge "Fix bug in on-device linking." into honeycomb
...
* commit '077fd5f6f5853eeecc6805513399dfcebb56cb66':
Fix bug in on-device linking.
2011-01-16 15:43:31 -08:00
Shih-wei Liao
077fd5f6f5
Merge "Fix bug in on-device linking." into honeycomb
2011-01-16 15:41:25 -08:00
Shih-wei Liao
0e7be13973
Fix bug in on-device linking.
...
Change-Id: Ic027d4cbf240a45da95a024067215a572c3bd7a9
2011-01-16 15:38:13 -08:00
Robert Greenwalt
3caa1bd106
Moving gsm.NetworkInfo to OperatorInfo
...
NetworkInfo had a bad name collision, wasn't gsm specific and was
really about operators.
Change-Id: Ic99108a3d0e2b3115f023398f85d9c7e5a3e38be
2011-01-16 15:31:22 -08:00
Jim Miller
04745768f7
am 717143ca: Fix 3339260: Remove emergency button from AccountUnlock screen
...
* commit '717143ca79ccccc8565117dfebcf9c6558d34e5b':
Fix 3339260: Remove emergency button from AccountUnlock screen
2011-01-16 15:23:16 -08:00
Jim Miller
717143ca79
Fix 3339260: Remove emergency button from AccountUnlock screen
...
Also minor fix to "sign in" button (bug 3347233).
Change-Id: I3710088b7ec554a7fc4214b088eb4cc5ce949de0
2011-01-16 15:20:19 -08:00
Romain Guy
aa00dd650c
am 94677083: Merge "Fix 9patch rendering in ExpandableListView." into honeycomb
...
* commit '94677083ab4c56ffef4a8a68d011d19333ab46c2':
Fix 9patch rendering in ExpandableListView.
2011-01-16 15:17:10 -08:00
Romain Guy
fb13abd800
Fix 9patch rendering in ExpandableListView.
...
Change-Id: I60843d61a40b0cb7dd09923cb4489a5a76f20486
2011-01-16 15:16:38 -08:00
Romain Guy
94677083ab
Merge "Fix 9patch rendering in ExpandableListView." into honeycomb
2011-01-16 15:14:39 -08:00