2043 Commits

Author SHA1 Message Date
Gilles Debunne
80f54ad9e8 Merge "Renamed drawable-xlarge to drawable-mdpi-xlarge." 2010-10-19 14:27:13 -07:00
Amith Yamasani
5931b1f415 Fix layout issues, add a maxWidth attribute to SearchView.
Bug: 3067611
Bug: 3067595
2010-10-19 12:24:27 -07:00
Gilles Debunne
949ca1c67c Renamed drawable-xlarge to drawable-mdpi-xlarge.
Change-Id: I27e39ba31ef653e651d87ae8409faacacf4e7ceb
2010-10-19 10:23:14 -07:00
Dianne Hackborn
4fa1a221b4 Remove public resource padding.
Change-Id: Id4f28ecfb7a87267c256571ed5f98652730b44fc
2010-10-19 08:16:49 -07:00
Adam Powell
8e5992ad66 Merge "New dialog assets. Cancelable AlertDialogs may now be canceled by tapping outside." 2010-10-18 19:01:44 -07:00
Adam Powell
fc94ddef2f New dialog assets. Cancelable AlertDialogs may now be canceled by tapping outside.
Change-Id: I061f09bd79a5f2b627fb0f01aba36f37449b849d
2010-10-18 18:57:11 -07:00
Nick Pelly
54770496d3 am 6b09a90a: am e47150e9: Fix up NFC permissions.
Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e'

* commit '6b09a90a818137de52a0c7325339849ccf584b9e':
  Fix up NFC permissions.
2010-10-18 16:42:18 -07:00
Kenny Root
027610a76e resolved conflicts for merge of 964eb438 to master
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
2010-10-18 13:03:35 -07:00
Nick Pelly
6b09a90a81 am e47150e9: Fix up NFC permissions.
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.
2010-10-18 10:26:12 -07:00
Nick Pelly
e47150e933 Fix up NFC permissions.
The initial (vendor) implementation had 4 perms, replace with 1.

Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.

Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())

Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-18 10:04:40 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
2010-10-16 16:32:15 -07:00
Kenny Root
097ea0bb50 am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread
Merge commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8' into gingerbread-plus-aosp

* commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8':
  Import revised translations DO NOT MERGE
2010-10-15 18:41:08 -07:00
Justin Ho
bce520e646 am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread
Merge commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca' into gingerbread-plus-aosp

* commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca':
  DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
2010-10-15 18:39:33 -07:00
Adam Powell
84321b2bed Change AlertDialogs to use button groups.
Ditch dumb prototype implementation of ButtonGroup.

Change-Id: I803ef51b0bf4059936ddeb9145ca37ee53cd24b9
2010-10-15 18:30:22 -07:00
Justin Ho
e35cd5f569 am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
Merge commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940' into gingerbread-plus-aosp

* commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
2010-10-15 18:24:30 -07:00
Justin Ho
92e0fd6ce2 am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread
Merge commit 'd364366824bf2b0aef81780eb673a42e0ba33bce' into gingerbread-plus-aosp

* commit 'd364366824bf2b0aef81780eb673a42e0ba33bce':
  DO NOT MERGE - Updated ADB icon
2010-10-15 18:23:18 -07:00
Kenny Root
dc83fd5a50 Merge "Import revised translations DO NOT MERGE" into gingerbread 2010-10-15 16:55:40 -07:00
Justin Ho
1ef2006409 DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
Change-Id: I5f86585618b008b727de2236b75b357c87840ecf
2010-10-15 16:15:16 -07:00
Jeff Brown
497a92cc5b Add keycodes and meta-key modifiers to support external keyboards.
Added new key maps for external keyboards.  These maps are intended to
be shared across devices by inheriting the "keyboards.mk" product
makefile as part of the device's product definition.

One of the trickier changes here was to unwind some code in
MetaKeyKeyListener that assumed that only the low 8 bits of the meta key
state were actually used.  The new code abandons bitshifts in favor
of simple conditionals that are probably easier to read anyways.
The special meta key state constants used by MetaKeyKeyListener
are now (@hide) defined in KeyEvent now so as to make it clearer that they
share the same code space even if those codes are not valid for KeyEvents.

The EventHub now takes care of detecting the appropriate key layout
map and key character map when the device is added and sets system
properties accordingly.  This avoids having duplicate code in
KeyCharacterMap to probe for the appropriate key character map
although the current probing mechanism has been preserved for legacy
reasons just in case.

Added support for tracking caps lock, num lock and scroll lock and
turning their corresponding LEDs on and off as needed.

The key character map format will need to be updated to correctly support
PC style external keyboard semantics related to modifier keys.
That will come in a later change so caps lock doesn't actually do
anything right now except turn the shiny LEDs on and off...

Added a list of symbolic key names to KeyEvent and improved the toString()
output for debug diagnosis.  Having this list in a central place in the
framework also allows us to remove it from Monkey so there is one less
thing to maintain when we add new keycodes.

Bug: 2912307
Change-Id: If8c25e8d50a7c29bbf5d663c94284f5f86de5da4
2010-10-15 16:00:07 -07:00
Kenny Root
88b6faad2c Import revised translations DO NOT MERGE
Change-Id: Ifa466bf152e7331f2ea16e925e714690d9034f3a
2010-10-15 15:11:18 -07:00
Roy West
ecc105668c am d23cc4b8: am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread
Merge commit 'd23cc4b814c01675f6503c4dcab21655c56d0256'

* commit 'd23cc4b814c01675f6503c4dcab21655c56d0256':
  Change storage names to match 10-13 decision
2010-10-15 14:26:08 -07:00
Justin Ho
ff14aa16ba DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6
2010-10-15 14:03:57 -07:00
Justin Ho
7e9f686413 DO NOT MERGE - Updated ADB icon
Change-Id: I358ce60203746ccf38d92f71d1c684670737c97b
2010-10-15 11:31:35 -07:00
Ben Murdoch
d609279c33 Set the correct style for TextAppearance.Holo.SearchResult
Values have been taken from the current TextAppearance.SearchResult
style. This was making WebTextView in the Browser show unreadable
autocomplete suggestions (pale grey text on a white background).

Change-Id: I35961e12ab96d29791c495723709b2eff5714471
2010-10-15 10:39:11 +01:00
Nick Pelly
f36c6db108 NFC API revision round 2.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>

Conflicts:

	Android.mk
	CleanSpec.mk
	core/java/android/app/ContextImpl.java
2010-10-14 19:16:35 -07:00
Justin Ho
6e48b5f97a am b593d976: Merge "Updated GPS icons and new status bar background" into gingerbread
Merge commit 'b593d976137389dcbe061f10ec13d79f0427baa3' into gingerbread-plus-aosp

* commit 'b593d976137389dcbe061f10ec13d79f0427baa3':
  Updated GPS icons and new status bar background
2010-10-14 18:36:39 -07:00
Justin Ho
852fcaf183 Updated GPS icons and new status bar background
Change-Id: If901a145b7cdb33b32076dcfb6964be59e3967da
2010-10-14 18:25:50 -07:00
Justin Ho
fd28b45125 am 1fefe88c: Another attempt at popup assets (hdpi and mdpi)
Merge commit '1fefe88cd0509df1e04e349f3caef7e5826d3e90' into gingerbread-plus-aosp

* commit '1fefe88cd0509df1e04e349f3caef7e5826d3e90':
  Another attempt at popup assets (hdpi and mdpi)
2010-10-14 17:42:08 -07:00
Justin Ho
1fefe88cd0 Another attempt at popup assets (hdpi and mdpi)
Change-Id: Iaa0e9b5f3545400b371c029e4152f52b113ab091
2010-10-14 17:26:54 -07:00
Adam Powell
302166c0fc Merge "Holo styling and metrics; holo spinners" 2010-10-14 16:24:59 -07:00
Adam Powell
89edde3efa Holo styling and metrics; holo spinners
Change-Id: Ib6d80e5e1a79b7a4ff208df8dbc097e7b9228d13
2010-10-14 16:20:47 -07:00
Shimeng (Simon) Wang
c42f8b8332 Remove not-used code.
issue: 3003933
Change-Id: I3221fb253fe6fbfe9e24368426d7e4a2c1e3502b
2010-10-14 14:52:28 -07:00
Kenny Root
b7f8032a7e am 229309e5: Merge "Import revised translations" into gingerbread
Merge commit '229309e582dfdd63c1ce903c73b63bcd74c75567' into gingerbread-plus-aosp

* commit '229309e582dfdd63c1ce903c73b63bcd74c75567':
  Import revised translations
2010-10-14 14:30:41 -07:00
Kenny Root
229309e582 Merge "Import revised translations" into gingerbread 2010-10-14 14:17:57 -07:00
Roy West
d23cc4b814 am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread
Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp

* commit '29f28cdc5315d11919595bf8623d6a67797a34e7':
  Change storage names to match 10-13 decision
2010-10-14 12:03:19 -07:00
Kenny Root
4cc79da76c Import revised translations
Change-Id: I66df6f7374f03bd6596a55026123c6139ab92c83
2010-10-14 09:41:52 -07:00
Roy West
c5c3bae565 Change storage names to match 10-13 decision
Change-Id: I1dc760846e7031a7cd090436da556533961695e1
2010-10-14 05:23:23 -07:00
Jeff Brown
d3a8f33be1 am 7eb67fb4: am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread
Merge commit '7eb67fb44098bf4b26a1a2d20516f632ab747805'

* commit '7eb67fb44098bf4b26a1a2d20516f632ab747805':
  Add text selection handles to preloaded drawables.
2010-10-13 23:36:10 -07:00
Joe Onorato
eb86aaaab3 am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96'

* commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
2010-10-13 23:34:21 -07:00
Justin Ho
d9fdcfdaad am c9110970: Merge "Updated media transport controls" into gingerbread
Merge commit 'c911097095d0dd909abf4f77628f2154be6dbf9a' into gingerbread-plus-aosp

* commit 'c911097095d0dd909abf4f77628f2154be6dbf9a':
  Updated media transport controls
2010-10-13 17:47:19 -07:00
Justin Ho
f0f95e61d4 Updated media transport controls
Change-Id: I928b7fcd0f9bd11d5f642e3c5207b00099fc8b41
2010-10-13 17:39:24 -07:00
Justin Ho
31e5901e4c am b6634127: Merge "Updating popup center asset (v5)" into gingerbread
Merge commit 'b663412741ca3fa30473106a7bda3a8a95a5e194' into gingerbread-plus-aosp

* commit 'b663412741ca3fa30473106a7bda3a8a95a5e194':
  Updating popup center asset (v5)
2010-10-13 17:33:36 -07:00
Justin Ho
4cc49d3e80 Updating popup center asset (v5)
Change-Id: I0acb31925e011ddbd668894f1291bc1ee94e5c97
2010-10-13 17:11:26 -07:00
Chung-yih Wang
bad553ba34 am b99db0c7: am 4367ab00: Set the wifi-only for SIP service as the default config.
Merge commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03'

* commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03':
  Set the wifi-only for SIP service as the default config.
2010-10-13 17:02:24 -07:00
Dianne Hackborn
bc931eaf15 am a007ab29: am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread
Merge commit 'a007ab294d83db987b05b49ab869566978a87494'

* commit 'a007ab294d83db987b05b49ab869566978a87494':
  Fix SD card mounting issues #3074555 and #3072332
2010-10-13 17:01:17 -07:00
Adam Powell
d8404b2373 Allow icon+text action buttons
Change-Id: I96d1f3958de3ac13cadbab108b87d6bae96e9473
2010-10-13 14:35:19 -07:00
Amith Yamasani
3f703de0fb Merge "Add voice button and a bunch of minor fixes for focus and visibility of ime, submit button and drop down." 2010-10-13 13:19:28 -07:00
Amith Yamasani
ebcf5a3a50 Add voice button and a bunch of minor fixes for focus and visibility of ime, submit button and drop down.
Bug: 3077768 suggestion drawer not dismissed
Bug: 3067611 submit button incorrectly displayed in some cases
2010-10-13 11:52:51 -07:00
Justin Ho
27023cc5fe am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
Merge commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp

* commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
2010-10-12 20:32:56 -07:00