2013 Commits

Author SHA1 Message Date
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
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
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
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
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 and " into gingerbread
Merge commit 'a007ab294d83db987b05b49ab869566978a87494'

* commit 'a007ab294d83db987b05b49ab869566978a87494':
  Fix SD card mounting issues  and 
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
Justin Ho
e03471e12f Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Justin Ho
c42d196f96 am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background
Merge commit '33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp

* commit '33bae9b826145677585a2171f4986d4c6433fd0d':
  Updated lockscreen asset (Hiroshi), new menu background
2010-10-12 20:24:37 -07:00
Justin Ho
33bae9b826 Updated lockscreen asset (Hiroshi), new menu background
Change-Id: Ibe8c535bcdd35668c7aae87b6e8c1ef622f3e148
2010-10-12 20:19:14 -07:00
Justin Ho
cdbd8ab789 Updated popup_ 9 patches and removing text_select_handle (hdpi)
Change-Id: I101a4ad12e7e88621073f860e39dcb16730d7722
2010-10-12 19:14:10 -07:00
Nick Pelly
6066da89a4 am 590b73bc: NFC API revision round 2.
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.
2010-10-12 19:00:54 -07:00
Gilles Debunne
78996c9376 Changed Cut/Copy/Paste assets.
New assets, in dark/light version.

Made public attributes of the Theme, so that they can be customized.

Select_all was not included in that change. It is supposed to be represented
as text instead of an icon. Waiting for a CL that enables this feature.

Change-Id: Icc912b2eb582295c60c0a409760d2c3d65989fc6
2010-10-12 18:58:46 -07:00
Adam Powell
4388ecbf94 Merge "Holo fixes and refinements" 2010-10-12 18:49:08 -07:00
Adam Powell
ccb013ffac Holo fixes and refinements
* Fix Holo.Light dialog text color for system-created dialogs
* Use the correct text anchor assets for selection mode
* Temp fix for small holo light button metrics

Change-Id: I974528418b69354961ea43abf8249c8caada8e17
2010-10-12 18:45:38 -07:00
Nick Pelly
590b73bc5b 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>
2010-10-12 18:37:26 -07:00
Winson Chung
a0a312225a Merge "Extracting default loading view definition into XML resource." 2010-10-12 18:25:25 -07:00
Justin Ho
dfd37a4748 am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread
Merge commit '45738f6700cff689eacda7c8192b76939ba20591' into gingerbread-plus-aosp

* commit '45738f6700cff689eacda7c8192b76939ba20591':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
2010-10-12 17:40:47 -07:00
Justin Ho
45738f6700 Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 2010-10-12 17:38:44 -07:00
Justin Ho
a78c85482e Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
Change-Id: Ic7089d0277582506b745cfa73d1a7bb311c600a7
2010-10-12 17:29:06 -07:00
Joe Onorato
c88a1f955c am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit '14854820eac895a925791fb41ccd330447fd4f02'

* commit '14854820eac895a925791fb41ccd330447fd4f02':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-12 16:27:22 -07:00
Jeff Brown
7eb67fb440 am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread
Merge commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp

* commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
  Add text selection handles to preloaded drawables.
2010-10-12 16:12:34 -07:00
Jeff Brown
fa3d9557c8 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Jeff Brown
b0061549a2 Add text selection handles to preloaded drawables.
Change-Id: Iad48388ada7a555681290998f4cb6f8390aa05d4
2010-10-12 15:22:13 -07:00
Joe Onorato
9a12a3c8d4 am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp

* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
2010-10-12 14:46:23 -07:00
Joe Onorato
b08a1af667 Remove dead code, and make the animation a setting.
When we don't do the brightness fade, turn off the electron beam instead.

Change-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08
2010-10-12 14:16:11 -07:00
Adam Powell
f16888f1e8 Holo fixes
* Fix up ButtonGroup to behave better.
* Fix bad states with holo list selectors.
* Clean up action mode UI components.
* Change action mode UI to use a text button instead of 'X' to dismiss.
* Fixed spinner dropdowns for Holo.Light

Change-Id: Ifc092bd549ffb539d6a3b2ddd95ebd4b114a441f
2010-10-12 11:57:45 -07:00
Chung-yih Wang
b99db0c70e am 4367ab00: Set the wifi-only for SIP service as the default config.
Merge commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551' into gingerbread-plus-aosp

* commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551':
  Set the wifi-only for SIP service as the default config.
2010-10-11 21:49:26 -07:00
Chung-yih Wang
4367ab00ed Set the wifi-only for SIP service as the default config.
Change-Id: I90d2d14b5d9c953e45f85d3d5128d096ea17b22e
bug-id: http://b/3068006
2010-10-12 12:39:50 +08:00
Dianne Hackborn
a007ab294d am ffbc4b94: Merge "Fix SD card mounting issues and " into gingerbread
Merge commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp

* commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83':
  Fix SD card mounting issues  and 
2010-10-11 19:17:05 -07:00
Dianne Hackborn
ffbc4b948d Merge "Fix SD card mounting issues and " into gingerbread 2010-10-11 19:13:33 -07:00
Dianne Hackborn
d39d515b91 Fix SD card mounting issues and
Change-Id: I79572bb4e92d2546abd97512a119ae74f0d72019
3074555: Kill "Shared storage safe to remove" notification
3072332: "blank shared storage" notification doesn't go anywhere
2010-10-11 19:12:21 -07:00
Gilles Debunne
8245acaab6 am 1457bb0e: am 6b8bdaa9: New AppsPermission and market style
Merge commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683'

* commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683':
  New AppsPermission and market style
2010-10-11 18:57:14 -07:00
Joe Onorato
14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-11 15:22:30 -07:00
Joe Onorato
6d74765662 Add a configuration option to turn on the screen when you unplug the device.
Bug: 3068624
Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
2010-10-11 15:16:28 -07:00
Adam Powell
be4d68e7b2 Updated styles and metrics.
* Added preliminary ButtonGroup support for buttons that display as a unit.
* Fixed a bug with MenuBuilder that caused old-style icon menus to fail.
* Added support for explicitly setting line height in text.

Change-Id: I1ba65f09dd9e1bc833d247ebe72052a21e3f99f0
2010-10-11 11:22:54 -07:00
Gilles Debunne
1457bb0ef6 am 6b8bdaa9: New AppsPermission and market style
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp

* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
  New AppsPermission and market style
2010-10-10 18:08:25 -07:00