Robert Greenwalt
80f7c594fa
am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
...
* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
Add external dependency API.
2011-04-07 14:22:03 -07:00
Robert Greenwalt
f4a29403ae
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Eric Fischer
567882e1f9
Merge "Import revised translations."
2011-04-07 14:08:55 -07:00
Eric Fischer
34ade71cff
Import revised translations.
...
Change-Id: I66670dc3d9c37fc3818764fa9839219208e83fbb
2011-04-07 13:51:31 -07:00
Robert Greenwalt
70c3d1c23b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
Robert Greenwalt
d55a6b498d
Add external dependency API.
...
An APN will not be connected to if some external dependency is not met.
bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Gilles Debunne
6a839703cd
Merge "Word suggestion popup added to EditText."
2011-04-06 17:07:27 -07:00
Gilles Debunne
6934044fd7
Word suggestion popup added to EditText.
...
A double tap on a word will now display a list of suggestions based
on the CorrectionSpans that were added by the IME.
This is a first implementation of this feature. It needs some attention from
designers.
Change-Id: If863107681ce82a1639f21315878f830c2991fb7
2011-04-06 15:04:26 -07:00
Eric Fischer
bef09dc022
am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'ad3bddab9246933971ff1b5360b0915e55579fe7':
Import revised translations. DO NOT MERGE
2011-04-06 14:16:12 -07:00
Eric Fischer
ad3bddab92
am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
Import revised translations. DO NOT MERGE
2011-04-06 14:12:31 -07:00
Eric Fischer
6d5f5faae0
Import revised translations. DO NOT MERGE
...
Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
2011-04-06 13:47:57 -07:00
Dianne Hackborn
3fc982f41f
Add new resource configurations for screen width/height in "dp".
...
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
2011-04-06 11:00:37 -07:00
Irfan Sheriff
9552766567
Merge "Add support for supplicant SCAN_INTERVAL"
2011-04-06 09:16:26 -07:00
Irfan Sheriff
2b7f63887e
Add support for supplicant SCAN_INTERVAL
...
Also, allow scan interval for framework and supplicant
to be configured at build time or run time
Bug: 4144882
Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
2011-04-06 09:11:15 -07:00
Mike Lockwood
b83dee77e2
Merge "MTP and media provider support for multiple storage devices:"
2011-04-05 13:36:49 -07:00
Mike Lockwood
b239b68376
MTP and media provider support for multiple storage devices:
...
- MTP support for multiple storage units
- Add storage_id column to media database for MTP storage ID
- Add framework resource for defining mount points and user visible descriptions
for multiple volumes
- Clean up locking in MtpServer JNI code
Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
2011-04-05 15:19:16 -04:00
Eric Fischer
9f3c6160e4
Merge "Import revised translations."
2011-04-05 11:18:57 -07:00
Eric Fischer
50a8be6c8a
Import revised translations.
...
Change-Id: I818cbbb1741e083bc105596dba103f2ee0c0582a
2011-04-04 17:29:34 -07:00
Jason parks
c5a229665d
am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
Send out a broadcast that the system is being factory reset.
2011-04-04 16:46:34 -07:00
Jason parks
5ee250aa74
am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
Send out a broadcast that the system is being factory reset.
2011-04-04 16:43:34 -07:00
Jason parks
1d73362597
am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Adam Cohen
4b6bf80fad
Merge "Making StackView res-out and click feedback colors stylable"
2011-04-04 11:27:07 -07:00
Adam Cohen
26f072c3ee
Making StackView res-out and click feedback colors stylable
...
Change-Id: Ia6241b1b66dc510b22bcf342d775f98eb7c86871
2011-04-01 16:28:51 -07:00
Jim Miller
27e61e454f
Merge "Get LockScreen working on phones."
2011-03-30 20:07:50 -07:00
Jim Miller
ad32bf4844
Get LockScreen working on phones.
...
Not the final UI, but it works.
Change-Id: Ia31d23069b2c365f711cb9d0a664648623554768
2011-03-30 18:53:18 -07:00
Justin Ho
bacdc8108a
am 0b397314: am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
...
* commit '0b3973143191962d3c4372523ed450f6a5bf0863':
Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 16:41:41 -07:00
Jeff Hamilton
284f965a59
am 016f8847: am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
...
* commit '016f8847471a9d4ffe6a03c29e0600529d51d929':
Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 16:40:34 -07:00
Justin Ho
0b39731431
am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
...
* commit '0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6':
Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 16:00:50 -07:00
Justin Ho
0b251aec43
am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
...
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 15:59:19 -07:00
Jeff Hamilton
016f884747
am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
...
* commit 'b98967942e9a764b80abc8ff1c6f6f2d620c0f7a':
Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 15:18:30 -07:00
Justin Ho
c7de6dd483
Replacing browser playback controls for inactive videos
...
Bug: 4136024
Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
2011-03-30 14:21:28 -07:00
Daniel Sandler
5317509129
Merge "Add missing dimension resource."
2011-03-30 12:56:09 -07:00
Daniel Sandler
bdf37690f3
Add missing dimension resource.
...
Bug: 4192397
Change-Id: I1912fffc8800ef522063bf42ffe08e752ae1350f
2011-03-30 15:25:38 -04:00
Adam Powell
54ab310e60
Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use
...
Change-Id: Ieb8127772cd62663d11ef893b47f9b2c7068391c
2011-03-30 11:34:00 -07:00
Jeff Hamilton
b98967942e
am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
...
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 09:30:40 -07:00
Jason parks
cca2f2f987
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
2011-03-30 08:17:53 -07:00
Christopher Tate
3d4bf17f49
Add view/drawable states for drag-accepting / drag-hovered
...
Added new drag_can_accept and drag_hovered XML attributes and the View
logic to support them. Drawable states are now refreshed automatically
when a drag starts/ends and when a drag crosses the boundary of a
participating view.
Change-Id: I25f8ee02c83b3fa4f27201997d7eabf4be653fd8
2011-03-29 15:27:58 -07:00
Eric Fischer
bc2489e4c5
am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
Import revised translations. DO NOT MERGE
2011-03-29 12:20:42 -07:00
Eric Fischer
627e59ad08
Import revised translations. DO NOT MERGE
...
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
2011-03-29 11:58:23 -07:00
Jeff Hamilton
10de0b31df
Make STOP_APP_SWITCHES signatureOrSystem.
...
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.
Bug: 4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
2011-03-25 16:17:53 -05:00
Jeff Brown
dff626c56a
Merge "Added a hovered state for drawables."
2011-03-24 16:42:08 -07:00
PY Laligand
c33d8d49e4
Added a hovered state for drawables.
...
Change-Id: I2b12c8593e04e37c8eb748946ca6d4d7a61de36a
2011-03-24 16:14:08 -07:00
Adam Powell
6bddd8771d
Fix bug 4084399 - with usb keyboard, actionbar menuitems with
...
icon+text take dpad focus twice in row
Fix action menu item layout focusability so that only the full item is
focusable. Fix up listeners appropriately.
Change-Id: I127c36404894869a08c5f4472491e3e596563c5c
2011-03-24 15:56:07 -07:00
Dianne Hackborn
03ef0ead5e
Fix holo tabs to work on phone screens.
...
This isn't perfect. I think the assets need to be reworked to
have padding at the bottom to account for the bar; in the change
here the text appears on top of the bar because it is aligned
with the bottom.
Also the icons now used for tabs are smaller than the old UI,
making the spacing here strange. For now I am dealing with all
of this by tweaking the layout dimensions.
Change-Id: I696100edba85a3f384d79aeb2538554c99d48437
2011-03-22 15:53:24 -07:00
Eric Fischer
b05f0b84b2
am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
Import revised translations. DO NOT MERGE
2011-03-22 13:59:20 -07:00
Eric Fischer
765ae04f61
Import revised translations. DO NOT MERGE
...
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
2011-03-22 13:38:10 -07:00
Justin Ho
28dcbdcc15
am 263fb828: am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
...
* commit '263fb8285c79a37d3c9dbd0f70d307b92f1ed8fc':
Fixing list selector theme Bug: 4147203
2011-03-22 11:42:20 -07:00
Simon Wilson
03aa986e6b
am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
DO NOT MERGE Change WiMAX indicator display
2011-03-21 18:02:57 -07:00
Justin Ho
6a21161095
am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
...
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
Fixing list selector theme Bug: 4147203
2011-03-21 17:59:59 -07:00
TK MUN
081148dd32
DO NOT MERGE Change WiMAX indicator display
...
Change WiMAX indicator display from data to signal indication
and add a new icon set.
Change-Id: I610f186e07f3d7af9e64bcbdd750371164ac51f5
2011-03-21 16:55:00 -07:00