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
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
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
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
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 #3074555 and #3072332 " into gingerbread
...
Merge commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp
* commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83':
Fix SD card mounting issues #3074555 and #3072332
2010-10-11 19:17:05 -07:00
Dianne Hackborn
ffbc4b948d
Merge "Fix SD card mounting issues #3074555 and #3072332 " into gingerbread
2010-10-11 19:13:33 -07:00
Dianne Hackborn
d39d515b91
Fix SD card mounting issues #3074555 and #3072332
...
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
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
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
Gilles Debunne
6b8bdaa9c8
New AppsPermission and market style
...
Bug 3067333
Change-Id: Ibbf444cfd9b1e2d7b51f4194d57c6dee30ac18ee
2010-10-10 17:57:55 -07:00
Justin Ho
90390e6918
am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
...
Merge commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df' into gingerbread-plus-aosp
* commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df':
Updated media playback controls, unlock screen, misc framework assets
2010-10-10 16:38:14 -07:00
Justin Ho
5b640bdee9
Updated media playback controls, unlock screen, misc framework assets
...
Change-Id: Ib7ee3d0ad81f2f27c33dcf698d5270b464d4430e
2010-10-10 16:07:22 -07:00
Hung-ying Tyan
ea445758ef
am 08faac3c: Unhide SIP API.
...
Merge commit '08faac3c26e12863858e1534985dd950193f755f' into gingerbread-plus-aosp
* commit '08faac3c26e12863858e1534985dd950193f755f':
Unhide SIP API.
2010-10-07 17:40:51 -07:00
Hung-ying Tyan
08faac3c26
Unhide SIP API.
...
Change-Id: I09468e3149a242a3b1e085ad220eb74f84ac6c68
2010-10-08 08:31:42 +08:00
Gilles Debunne
c6faec80d2
am 4a962a06: Merge "Removing \'last\' of red cross asset." into gingerbread
...
Merge commit '4a962a06db88d7132448808aaae82b94728b69a6' into gingerbread-plus-aosp
* commit '4a962a06db88d7132448808aaae82b94728b69a6':
Removing 'last' of red cross asset.
2010-10-07 15:47:23 -07:00
Justin Ho
51501aa870
am b74941e3: Merge "Fixed popup assets (background)" into gingerbread
...
Merge commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4' into gingerbread-plus-aosp
* commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4':
Fixed popup assets (background)
2010-10-07 14:02:22 -07:00
Gilles Debunne
5e3329b5fa
am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
...
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp
* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
Removed unused and broken screen_progress
2010-10-07 14:01:48 -07:00
John Wang
5df4b5a78b
am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
...
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp
* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
Add flag to skip restoring network seletion.
2010-10-07 14:00:53 -07:00
Gilles Debunne
4a962a06db
Merge "Removing 'last' of red cross asset." into gingerbread
2010-10-07 13:53:16 -07:00
Gilles Debunne
94f183b1b4
Removing 'last' of red cross asset.
...
Change-Id: Ie325195220f95074d8e12e64216d1b02e9b3e2af
2010-10-07 12:07:43 -07:00
Gilles Debunne
3c88039187
Fixed popup assets (background)
...
Change-Id: I8a651915119fec6a06a5f43315408b0d06c4b7d6
2010-10-07 10:54:54 -07:00
Gilles Debunne
e86a6b2a4d
Merge "Removed unused and broken screen_progress" into gingerbread
2010-10-07 10:52:11 -07:00
John Wang
35c4c211e0
Add flag to skip restoring network seletion.
...
For bug 3045366.
Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
2010-10-07 09:44:19 -07:00
Adam Powell
86b500289b
am fbb3b476: Fix bug 3066313 - integrate new text anchor assets.
...
Merge commit 'fbb3b4768e858f004fe9a87e83b066244c829d87' into gingerbread-plus-aosp
* commit 'fbb3b4768e858f004fe9a87e83b066244c829d87':
Fix bug 3066313 - integrate new text anchor assets.
2010-10-07 07:18:21 -07:00
Eric Fischer
7778173a32
am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp
* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
Import revised translations. DO NOT MERGE
2010-10-07 07:16:56 -07:00
Gilles Debunne
f960718c1c
am 1ae32bfe: New assets for buttons and notification
...
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp
* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
New assets for buttons and notification
2010-10-07 07:15:05 -07:00
Adam Powell
fbb3b4768e
Fix bug 3066313 - integrate new text anchor assets.
...
This adds the differentiated left/right anchors for hdpi and further
tweaks the behavior of text anchors.
Highlights:
* New assets are translucent - increased visibility for whatever is
beneath.
* Start and end anchors may not cross one another.
* Minimum selection size is now 1.
* Touch targeting tweaked.
Change-Id: I601361323916ee19149562a23dc3242d908da45c
2010-10-06 21:46:28 -07:00
Gilles Debunne
8b1764fdc8
Removed unused and broken screen_progress
...
Change-Id: I3b9557d1d4bdc55d6468c276efc77bde440755af
2010-10-06 19:09:52 -07:00
Eric Fischer
3d1841c788
Import revised translations. DO NOT MERGE
...
Change-Id: Id9a7d2da704ed4d37efa8646815835fc6a7c5473
2010-10-06 17:11:06 -07:00
Gilles Debunne
1ae32bfebf
New assets for buttons and notification
...
Change-Id: I95ffa7600476f97e3be3c577ef55855abeaeac5e
2010-10-06 14:32:29 -07:00
Adam Powell
ee7e0efcc1
am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
...
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp
* commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
2010-10-05 16:46:05 -07:00
Adam Powell
59c4cb9e8f
Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
2010-10-05 16:39:24 -07:00
Adam Powell
65e8b47624
am 5a5fff71: Fix bug 3064143 - remove default bold on buttons
...
Merge commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp
* commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
Fix bug 3064143 - remove default bold on buttons
2010-10-05 15:49:23 -07:00
Adam Powell
5a5fff7101
Fix bug 3064143 - remove default bold on buttons
...
Change-Id: Id4d09d50270c575f5179328ab6fb788b45131638
2010-10-05 15:32:48 -07:00
Adam Powell
737e8fe2c7
DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
...
Change-Id: If34c8ea4e15697420adad0bc404f3c278efd7c1b
2010-10-05 15:22:07 -07:00
Adam Powell
815b1eb870
am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
...
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp
* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
Fix bug 3061769
2010-10-04 19:59:35 -07:00