Jim Miller
91fd9a9772
Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"
2011-02-16 17:49:17 -08:00
John Reck
4041c914e5
Add missing resources
...
Bug: 3463011
Change-Id: Ie312c72bf7315cddfef12118de11bcfa634e73dc
2011-02-16 16:41:04 -08:00
Jim Miller
6b85768058
Fix 3197205: Minor edits to device policy admin strings and documentation
...
Change-Id: I3788772c375b916752cd8a98ff5d3751448e4334
2011-02-16 16:27:41 -08:00
John Reck
0f2df4a63e
Merge "Adds localization support for incognito start page"
2011-02-16 15:05:04 -08:00
John Reck
d6662b5eb7
Adds localization support for incognito start page
...
Bug: 3460867
This change has BrowserFrame intercept browser:incognito URLs to
provide a localized version of them. It also adds a spanish
translation for the page.
Change-Id: I888453d895ea1047544a09ba7f23645e2746bea6
2011-02-16 14:43:31 -08:00
Mike Lockwood
984dd8a206
Merge "UsbManager: New APIs for USB accessories"
2011-02-16 12:42:35 -08:00
Nick Pelly
ef12256ca5
am d8d51fed: am 8c8e9d9a: am 1df862a4: Minor doc update.
...
* commit 'd8d51fed861cd36f57f1eb2542def23322379d7c':
Minor doc update.
2011-02-16 09:27:37 -08:00
Nick Pelly
d8d51fed86
am 8c8e9d9a: am 1df862a4: Minor doc update.
...
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
Minor doc update.
2011-02-16 09:25:09 -08:00
Nick Pelly
8c8e9d9a7f
am 1df862a4: Minor doc update.
...
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465
Minor doc update.
...
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
2011-02-16 09:18:34 -08:00
Mike Lockwood
9182d3c4eb
UsbManager: New APIs for USB accessories
...
USB accessories are peripherals that connect to android devices as a USB host.
When connected, the accessory will first identify itself to the android device
by sending manufacturer, product, accessory type and version strings
to the device, and then request the device to enter USB accessory mode.
The device will then enable the USB accessory kernel driver and disable
all other USB functionality except possibly adb
(adb can be used while the android device is connected to the PC
and the PC is running software that emulates a USB accessory)
The class android.hardware.UsbAccessory is used to describe the
currently attached USB accessory.
UsbAccessory contains the manufacturer, product, accessory type
and version strings to identify the accessory.
The accessory can be opened as a ParcelFileDescriptor, which can be used
to communicate with the accessory over two bulk endpoints.
The Intents UsbManager.USB_ACCESSORY_ATTACHED and
UsbManager.USB_ACCESSORY_DETACHED are broadcast when accessories are
connected and disconnected to the device. The USB_ACCESSORY_ATTACHED
contains a UsbAccessory object for the attached accessory as an extra.
The Intent also contains string extras for the manufacturer, product,
accessory type and version strings to allow filtering on these strings.
Change-Id: Ie77cbf51814a4aa44a6b1e62673bfe4c6aa81755
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-16 08:25:16 -05:00
Gilles Debunne
f75c97e023
Text insertion cursor is now defined by a Drawable.
...
Bug 3261766
If defined, the drawable is used instead of directly drawing a 1 pixel
line. This makes the cursor more fancy and more visible.
The drawable is currently clipped by the TextView's limits, which is
currently visible on the left when the cursor is at the first position.
To solve this issue properly, we would need to propagate a do-not-clip
up in the hierarchy.
Change-Id: I99f6001048eed14104994acf6bab942dda8eb38e
2011-02-14 18:29:39 -08:00
Dianne Hackborn
da048264a3
Fix issue #3414684 : task_intra_wallpaper transitions have some inconsistency
...
Change-Id: Iba2a41025ce3d0513e7f9edc5fd63657576544c1
2011-02-14 14:26:52 -08:00
John Reck
e4fee50558
Fix spacing issue
...
Bug: 3432069
Change-Id: If58d19cacb99f3ab7fdc4d8fdbb86f0853010ed1
2011-02-10 11:33:35 -08:00
Cary Clark
a81c2193f7
Merge "move selectAll to match framework"
2011-02-09 16:05:13 -08:00
Cary Clark
310433b258
move selectAll to match framework
...
bug:3439736
Change-Id: Ib4f1464ab927252eb223e3d9729bea216ebc0d54
2011-02-09 18:58:17 -05:00
Eric Fischer
c3e3cc3dee
am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
Import revised translations. DO NOT MERGE
2011-02-09 10:47:47 -08:00
Eric Fischer
b8a036307a
Import revised translations. DO NOT MERGE
...
Change-Id: I989585acd6f901a82e8db9b07257af5a5736989e
2011-02-08 18:00:38 -08:00
Eric Fischer
c1c3143347
am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
2011-02-08 17:32:18 -08:00
Scott Main
121370d25c
am 3c565377: am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
...
* commit '3c5653773d6b48f27aa52d746a7a6f8728d5ba36':
docs: fix links to revised fundamentals documents
2011-02-08 15:06:54 -08:00
Scott Main
3c5653773d
am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
...
* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
docs: fix links to revised fundamentals documents
2011-02-08 14:57:45 -08:00
Scott Main
b508d6e26e
Merge "docs: fix links to revised fundamentals documents" into honeycomb
2011-02-08 13:34:51 -08:00
Scott Main
7aee61f5a9
docs: fix links to revised fundamentals documents
...
Change-Id: Ie2a660cce1d00f924c9fde5c6a00776307e5e1c7
2011-02-08 11:37:44 -08:00
Eric Fischer
1e09ca2a1f
am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'c7bece13495949db1736263a7cf5cf67c6165c51':
Import revised translations. DO NOT MERGE
2011-02-08 10:40:47 -08:00
Adam Powell
326a23a381
Merge "Fix bug 3426162 - Overflow menu closes on its own"
2011-02-07 18:11:53 -08:00
Adam Powell
f2d7a5d831
Fix bug 3426162 - Overflow menu closes on its own
...
Makes populating action menus smarter, doesn't completely empty and
repopulate. Fixes issues where changing menus can leave popups without
an anchor.
Change-Id: I03cc266f0952123c5704a78cdcfc69b77af1915b
2011-02-07 18:09:56 -08:00
Eric Fischer
7dd2196e8b
Import revised translations. DO NOT MERGE
...
Change-Id: Icb56518620be62481ed0d152f7eb9ab44d6f759d
2011-02-07 17:19:23 -08:00
Romain Guy
f0907fe6d4
am 9732d9e6: am 43703325: Merge "New default wallpaper" into honeycomb
...
* commit '9732d9e6ea78b9418cdef0054252d71292812f23':
New default wallpaper
2011-02-07 13:41:42 -08:00
Eric Fischer
dff2fea9b1
Import revised translations. DO NOT MERGE
...
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
2011-02-07 13:17:26 -08:00
Adam Powell
e7175e848b
am 86ce6866: am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
...
* commit '86ce68668c700bd4090d6ef74df3483ce9fea957':
Asset updates for dialog frames and seek bar thumbs
2011-02-07 11:38:25 -08:00
Justin Ho
b843c687a7
am 6d1fbba6: am 40523b1b: Merge "Updating default wallpaper" into honeycomb
...
* commit '6d1fbba68608dfd8d91d14d67bc34255a14ee4ac':
Updating default wallpaper
2011-02-07 11:38:04 -08:00
Amith Yamasani
9edc5c056f
am 9589ac6c: am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb
...
* commit '9589ac6c3f63a632e078adcc8ef742412af2014c':
Expanded volume panel with sliders and mute buttons.
2011-02-07 11:36:32 -08:00
Justin Ho
e44e28fa11
am 0c3169cf: am 60a008ed: Updated volume dialog assets
...
* commit '0c3169cf208b253b1f3f41ca82796a464eeec464':
Updated volume dialog assets
2011-02-07 10:57:19 -08:00
Justin Ho
f04b353573
am fc05bc3b: am cc84ea17: Merge "Updated default wallpaper" into honeycomb
...
* commit 'fc05bc3b36c665a0da2661d57a2c5a68245e6a68':
Updated default wallpaper
2011-02-07 10:48:07 -08:00
Justin Ho
6d9aa80ae9
am efba660d: am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb
...
* commit 'efba660d8efb8ed2f8c31c4aeea81b32016ad601':
Adding remaining volume dialog assets
2011-02-07 10:47:17 -08:00
Justin Ho
4a01756c99
am 8bdfcaa0: am 9b95d352: Updated Talk notification icon Bug: 3362749
...
* commit '8bdfcaa0c452dba14b1dc03d9a78728bb39e72a0':
Updated Talk notification icon Bug: 3362749
2011-02-07 10:46:47 -08:00
Gilles Debunne
2f7e9d403a
am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
...
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-04 15:49:56 -08:00
Gilles Debunne
53841df2a4
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
2011-02-04 15:46:06 -08:00
Romain Guy
9732d9e6ea
am 43703325: Merge "New default wallpaper" into honeycomb
...
* commit '43703325d8a8b755b9891708006abe8700884538':
New default wallpaper
2011-02-03 23:08:26 -08:00
Romain Guy
43a1da0807
New default wallpaper
...
Change-Id: Iddb593e0b1775725b1bfaa2c74fb2f53fb7a4561
2011-02-03 22:36:03 -08:00
Justin Ho
9b50aebc60
am 7d75cd65: am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
...
* commit '7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
Changing Honeycomb default wallpaper
2011-02-03 17:17:35 -08:00
Justin Ho
8e0bf64c6f
am 8e2c67ea: am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
...
* commit '8e2c67ea26d38677802f3029472aa2393f47173d':
Adding new volume control dialog icons
2011-02-03 17:15:21 -08:00
Adam Powell
86ce68668c
am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
...
* commit 'c1be7ac9121ac8b7b7cfd2205ff928fb0d11fef8':
Asset updates for dialog frames and seek bar thumbs
2011-02-03 17:00:10 -08:00
Adam Powell
c1be7ac912
Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
2011-02-03 16:57:21 -08:00
Justin Ho
6d1fbba686
am 40523b1b: Merge "Updating default wallpaper" into honeycomb
...
* commit '40523b1b27826ee58a101b0450eff74ab14cb0b5':
Updating default wallpaper
2011-02-03 16:55:07 -08:00
Justin Ho
40523b1b27
Merge "Updating default wallpaper" into honeycomb
2011-02-03 16:53:40 -08:00
Justin Ho
6e396c0d5c
Updating default wallpaper
...
Change-Id: I176840dc2c08653827038246f187296029b22af4
2011-02-03 16:50:19 -08:00
Adam Powell
d650b51139
Asset updates for dialog frames and seek bar thumbs
...
Change-Id: I3214fe9a2f1e2404d29f0a2ea22ac2fdf4ddbf31
2011-02-03 16:47:11 -08:00
Amith Yamasani
9589ac6c3f
am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb
...
* commit '823fbbbab5856fa46f56c7acbdddaa50bf211d09':
Expanded volume panel with sliders and mute buttons.
2011-02-03 16:13:37 -08:00
Amith Yamasani
823fbbbab5
Merge "Expanded volume panel with sliders and mute buttons." into honeycomb
2011-02-03 16:11:32 -08:00