Dianne Hackborn
7c7f8e18de
am 0a8a2324: Merge "Fix issue #4603422 : Compatibility mode button doesn\'t always update" into honeycomb-mr2
...
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
Fix issue #4603422 : Compatibility mode button doesn't always update
2011-06-14 15:14:34 -07:00
Dianne Hackborn
7d04932ef5
Fix issue #4603422 : Compatibility mode button doesn't always update
...
We now tell the system bar every time the top activity has changed for
it to re-evaluate its UI state.
Also fix issue #: 4607102 Low rider notifications. It turns out this
was due to the change in the dialog asset; the notification UI was relying
on this having a lot of padding to make it sit above the status bar.
Now we have an explicitly mechanism to set how much it overlaps (or doesn't)
the status bar.
Change-Id: Iab5ebd86e620ff4fc4cd77206e18af962ec2830e
2011-06-14 15:05:16 -07:00
John Wang
5328bf0b2e
Set emergency call text visibility.
...
Set emergency call text visibility based on
emergencyCallCapable config for sim missing
and networklock screens.
bug:4392059
Change-Id: Ibfe92405ada7b452927940295c090d88ecd79519
2011-06-08 19:51:57 -07:00
John Wang
0f7b3f8ba5
Add SIM PUK unlockscreen.
...
Puk unlockscreen is implemented as SimPukUnlockScreen.
Added config_enable_puk_unlock_screen to control the display of puk unlock screen.
Using config_voice_capable to control the display of emergency call button.
bug:4384956
Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
2011-06-07 10:12:38 -07:00
Gilles Debunne
4ce6822bc6
am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
...
* commit '24de44a1877be3e5d63697f90c98a87a4d88b1fb':
ExternalStorageFormatter takes an optional StorageVolume target.
2011-05-26 15:47:14 -07:00
Gilles Debunne
37051cdd86
ExternalStorageFormatter takes an optional StorageVolume target.
...
Change-Id: Ic85689659dbf49a7fcc1b7aaf25e4a94e62848b9
2011-05-26 11:45:17 -07:00
Adam Powell
d40575eb98
am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
...
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
DO NOT MERGE Action bar config changes
2011-05-19 17:06:09 -07:00
Adam Powell
dacbb746c9
DO NOT MERGE Action bar config changes
...
Handle action bar padding on configuration changes when the app
handles these changes itself.
Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
2011-05-19 15:38:27 -07:00
Adam Powell
98603eed2f
am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
...
* commit '30a76196c8f426b530a80166817d3280acb2b100':
Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:25:58 -07:00
Adam Powell
5d6c990b7f
Fix bug 4416126 - orientation change bug with action bar overflow menu
...
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
2011-05-17 20:20:52 -07:00
Adam Powell
bd32a79ecb
am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
2011-05-17 12:18:05 -07:00
Adam Powell
1b4a1628f3
Prevent cases of bogus action bar measurement.
...
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
2011-05-17 12:14:17 -07:00
Adam Powell
21f1d49f0e
am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:45:29 -07:00
Adam Powell
b07f943273
DO NOT MERGE Use action bar overflow menus on large configurations as
...
well as xlarge.
ICS will have a more intelligent way of determining this.
Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d
2011-05-16 13:46:38 -07:00
Irfan Sheriff
fba19ff5e8
DO NOT MERGE Define Protocol class
...
Adds a common namespace for communication across
different state machines
Change-Id: Ib6a29715c651371f91a950348a8525275b6026a0
2011-05-06 16:05:53 -07:00
Wink Saville
0b80114a2d
Make DataConnection asynchronous.
...
Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
2011-05-02 21:55:04 -07:00
Wink Saville
0246bbc8d7
Enhance AsyncChannel.
...
- Use Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master
Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
2011-05-02 10:44:56 -07:00
Irfan Sheriff
3fc75e9267
Define Protocol class for use with StateMachine
...
Adds a common namespace for communication across
different state machines
Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
2011-04-28 11:10:03 -07:00
Wink Saville
64c42cae44
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
...
Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
2011-04-18 14:55:10 -07:00
Wink Saville
d3059487ab
Move ProcessedMessage into HierarchicalStateMachine.
...
ProcessedMessage is really private to HSM and so moving
it into the HSM class.
Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
2011-04-11 11:51:28 -07:00
Daisuke Miyakawa
10221a22dd
am b02d3956: am e16a1bfa: Use system locale list.
...
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
Use system locale list.
2011-03-18 11:27:22 -07:00
Daisuke Miyakawa
b02d395650
am e16a1bfa: Use system locale list.
...
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
2011-03-18 11:23:00 -07:00
Daisuke Miyakawa
e16a1bfa9c
Use system locale list.
...
Context's assets may be different from system's. We should
prefer system's to reflect PRODUCT_LOCALE.
Bug: 4104675
Change-Id: I968c3baf6bfeb945f1b71ec709d5088332482319
2011-03-17 19:56:13 -07:00
Adam Powell
fbe9ca7262
am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1
...
* commit '1d233d9708e39f5b57b231746df658567b153484':
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
2011-03-15 12:51:07 -07:00
Adam Powell
c18c38f36e
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
...
Change-Id: I23c736ad458c721dfa86563f66b42dd5d6ca708e
2011-03-15 11:57:46 -07:00
Brad Fitzpatrick
b81d7f8338
am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit '33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:42:58 -07:00
Brad Fitzpatrick
33dd1bae6e
am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
29d75c9a10
Merge "Fixing improper boxing to Integer instead of Long."
2011-03-15 11:03:29 -07:00
Mike Lockwood
151c74b3c6
am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
...
* commit 'e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
Add a dialog to ask user to start an application for a USB device or accessory
2011-03-14 06:55:24 -07:00
Mike Lockwood
bce6f8f249
Add a dialog to ask user to start an application for a USB device or accessory
...
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity
Bug: 4074719
Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-13 19:18:08 -04:00
Jim Miller
7b7a8ca615
am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
...
* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
2011-03-10 23:01:42 -08:00
Jim Miller
1b365921e8
Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
...
Change-Id: I07bbed7843857158cd2c1ffd9b184bde7fd5860d
2011-03-10 17:20:21 -08:00
Jeff Brown
e229621219
am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '06a0c9f5ee1f1c51607446f29ffb9697fa95e549':
Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)
2011-03-09 18:29:22 -08:00
Jeff Brown
06a0c9f5ee
Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
2011-03-09 18:27:16 -08:00
Dianne Hackborn
de478eca19
am 7b5cb3c0: Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
...
* commit '7b5cb3c033f758368580664a8bdad43b47f3682d':
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
2011-03-09 15:50:34 -08:00
Dianne Hackborn
7b5cb3c033
Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
2011-03-09 15:47:24 -08:00
Dianne Hackborn
32de2f67ea
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
...
...addHistoryRecordLocked(BatteryStatsImpl.java:1210)
It was doing a bunch of stuff without holding a lock!
Change-Id: Ie5b56514370e0bfc87ba7737d75e01df0859817e
2011-03-09 14:03:35 -08:00
Jeff Brown
696e66e44b
Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)
...
Change-Id: I657588ae08fa462a6ad79326bcd8a199885ff28b
2011-03-09 02:46:45 -08:00
Adam Powell
529eb76b8a
am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
...
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:25:10 -08:00
Adam Powell
2b0952b197
Fix bug 4065021 - Adjust spacing of the "home" action bar item to be
...
consistent with the "up" indicator
Make sure that the "home" affordance in the action bar always occupies
the same amount of space regardless of whether or not the "up"
indicator is visible. This means centering the application icon/logo
in the remaining space after the "up" indicator has been added.
Change-Id: I3c81cfe8255546d4dd676af913895713baba4f13
2011-03-09 00:17:42 -08:00
Adam Powell
6fd61629b3
am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
...
* commit '43a811979d55587e014134f6050dc90ca918f9ce':
Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:09:28 -08:00
Adam Powell
8fca37ce30
Fix bug 3501766 - Make the action bar "up" visual more prominent
...
Change-Id: Id4b104dd6ca1df662479ab54f045e119585f990f
2011-03-07 14:54:48 -08:00
Soojung Shin
3fe49d8168
am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'fa680a18f617de202912b8a9fe3fc0890a9fe09e':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:10:28 -08:00
Soojung Shin
fa680a18f6
am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-04 17:16:49 -08:00
Soojung Shin
ff5a09904f
Added to check for supporting mms content-disposition, utf8 decoding.
...
Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-03-04 14:32:31 -08:00
Jozef BABJAK
0dbe721d0a
Fixing improper boxing to Integer instead of Long.
...
This is tricky: entry.getMessageBox() returns int, so it is
by default boxed to Integer. Map.get() however accepts Objects,
so it ignores the difference, but nothing is find during lookup,
just because Long and Integer objects are compared using equals(),
which has to lead to 'false' result. So, explicit boxning to Long
is unnecessary here.
Change-Id: I967a7829a8926410a00274c6b5e312e1af567299
2011-03-03 10:09:53 +01:00
Mike Lockwood
7866be2b76
am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
...
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00
Robert Greenwalt
7e48e76cab
Merge "Start using NetworkUtils.numericToInetAddress."
2011-03-02 12:10:51 -08:00
Robert Greenwalt
e590373ea7
Start using NetworkUtils.numericToInetAddress.
...
Generates InetAddresses without risking an accidental dns lookup. For use with supposedly
numeric-only ip address strings.
Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
2011-03-02 11:37:32 -08:00
Mike Lockwood
40bbf9295d
DO NOT MERGE: Backport USB accessory support to gingerbread
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 23:09:12 -08:00