Daniel Sandler
79a8bf071e
Shrink status bar by 2dip to match designs.
...
Change-Id: Ib25b827d97d05f91ba8b494d49d3be410537cb80
2010-09-02 14:35:09 -04:00
Kenny Root
818c830c59
am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
...
Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74'
* commit '8328578152fbfd23952a6cda4b2e60853d78eb74':
Allow native shared libraries in ASEC containers
2010-08-27 18:11:06 -07:00
Dianne Hackborn
405951b59c
am 8da20dd0: am 4f8c2f26: Fix docs build.
...
Merge commit '8da20dd03797dcdc1f417fe9cebc21825551dd69'
* commit '8da20dd03797dcdc1f417fe9cebc21825551dd69':
Fix docs build.
2010-08-27 18:10:49 -07:00
Wu-cheng Li
769690e9ea
am af610b2b: am 1620d118: Fix SDK build error.
...
Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048'
* commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048':
Fix SDK build error.
2010-08-27 18:10:17 -07:00
Wu-cheng Li
7fe6d3f13a
am 705c2e66: am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread
...
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'
* commit '705c2e66dcb358c865cf912a5496825088044b79':
Unhide camera fps range API and deprecate old ones.
2010-08-27 18:09:48 -07:00
Robert Greenwalt
fc40701c8b
Merge "resolved conflicts for merge of 4ea54f44 to master"
2010-08-27 17:27:02 -07:00
Daniel Lehmann
fff98cd16b
Merge "Perform a float division for screenTravelCount"
2010-08-27 16:45:49 -07:00
Kenny Root
8328578152
am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
...
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp
* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
Allow native shared libraries in ASEC containers
2010-08-27 16:45:45 -07:00
Daniel Lehmann
4ef1da3c04
Perform a float division for screenTravelCount
...
Change-Id: Ie0f23344a26c7ecf1a641e60d649ad0fc54fecbf
2010-08-27 16:40:59 -07:00
Kenny Root
85387d7ba3
Allow native shared libraries in ASEC containers
...
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.
Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.
Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
2010-08-27 16:40:06 -07:00
Gilles Debunne
71eaac0880
am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread
...
Merge commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85'
* commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85':
Broken build. Missing ;
2010-08-27 16:18:37 -07:00
Brad Fitzpatrick
a222510af8
am 2479097e: am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
...
Merge commit '2479097ecb899f1e193063e3ce126c721e13c455'
* commit '2479097ecb899f1e193063e3ce126c721e13c455':
Document blocking behavior of ImageView setImageURI and setImageResource
2010-08-27 16:18:24 -07:00
Dianne Hackborn
8da20dd037
am 4f8c2f26: Fix docs build.
...
Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp
* commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699':
Fix docs build.
2010-08-27 16:18:09 -07:00
Dianne Hackborn
4f8c2f26bf
Fix docs build.
...
Change-Id: I49591c46080361acf5b528116726c27b6ed9da9a
2010-08-27 16:14:42 -07:00
Brad Fitzpatrick
7f7ce40f90
resolved conflicts for merge of 28130bae to master
...
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
2010-08-27 16:11:27 -07:00
Gilles Debunne
a16fb779d5
am 084dd872: am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread
...
Merge commit '084dd872b1bf9f7de87554d40d89df1f30b11c45'
* commit '084dd872b1bf9f7de87554d40d89df1f30b11c45':
Fix for 512 limit in assetManager.list
2010-08-27 16:06:13 -07:00
Eric Rowe
bfa6d1dbe4
am aed5d62a: am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
...
Merge commit 'aed5d62ac1278c032528921798529dbd824a1865'
* commit 'aed5d62ac1278c032528921798529dbd824a1865':
Improve logging and flexibility of BT stress tests.
2010-08-27 15:52:33 -07:00
Dianne Hackborn
8e3d2382db
Merge "Fix some SDK build breakage. Not all."
2010-08-27 15:42:19 -07:00
Dianne Hackborn
f6d952bbc8
Fix some SDK build breakage. Not all.
...
Change-Id: I2791b0a7c48d03cb6e5ca93771efb56c0a0c1956
2010-08-27 15:41:13 -07:00
Wu-cheng Li
af610b2b9f
am 1620d118: Fix SDK build error.
...
Merge commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12' into gingerbread-plus-aosp
* commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12':
Fix SDK build error.
2010-08-27 15:13:53 -07:00
Wu-cheng Li
1620d118a4
Fix SDK build error.
...
Change-Id: I4705c10da850d684caa7067d656aff11bc65acbb
2010-08-27 15:09:20 -07:00
Sascha Brawer
d5426d7f61
Merge "Added default map boundaries for locale rm-CH. Cloned from values-de-rCH/arrays.xml."
2010-08-27 14:37:19 -07:00
Wu-cheng Li
705c2e66dc
am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread
...
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp
* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
Unhide camera fps range API and deprecate old ones.
2010-08-27 14:22:21 -07:00
Wu-cheng Li
5f1e69c76e
Unhide camera fps range API and deprecate old ones.
...
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.
Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
2010-08-27 14:19:32 -07:00
Gilles Debunne
053d5ce992
am ee4831c4: Merge "Added char limit to string" into gingerbread
...
Merge commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33' into gingerbread-plus-aosp
* commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33':
Added char limit to string
2010-08-27 13:16:24 -07:00
Gilles Debunne
9220948272
Added char limit to string
...
Bug http://b/issue?id=2953774
Change-Id: I8aa1009712b46e54942a3d653059f464dabc3f9f
2010-08-27 13:12:32 -07:00
Gilles Debunne
95464c9aa0
am 445ab76c: Merge "Broken build. Missing ;" into gingerbread
...
Merge commit '445ab76c49779998543bb78881f5d9f8ae81e598' into gingerbread-plus-aosp
* commit '445ab76c49779998543bb78881f5d9f8ae81e598':
Broken build. Missing ;
2010-08-27 12:23:47 -07:00
Gilles Debunne
aeaf2830f5
am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread
...
Merge commit 'e69b286005b0b543e274f523d894e069811215a6' into gingerbread-plus-aosp
* commit 'e69b286005b0b543e274f523d894e069811215a6':
DO NOT MERGE Removed "Stop selecting text" option.
2010-08-27 12:23:43 -07:00
Brad Fitzpatrick
2479097ecb
am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
...
Merge commit 'b94493feaf8b7a620a25c23c1f131a999ed61293' into gingerbread-plus-aosp
* commit 'b94493feaf8b7a620a25c23c1f131a999ed61293':
Document blocking behavior of ImageView setImageURI and setImageResource
2010-08-27 12:23:39 -07:00
Amith Yamasani
f956fd6d13
am 4b4114d1: am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text.
...
Merge commit '4b4114d155b4f3d5cc4179934cb6403b1776261d'
* commit '4b4114d155b4f3d5cc4179934cb6403b1776261d':
Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
2010-08-27 12:14:46 -07:00
David Brown
93637d3ee7
am b4298cd8: am 846eb30f: Add SipAddress to ContactsContract.
...
Merge commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c'
* commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c':
Add SipAddress to ContactsContract.
2010-08-27 12:14:13 -07:00
Brad Fitzpatrick
28130baefb
resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp
...
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
2010-08-27 12:08:40 -07:00
Dianne Hackborn
0430dcf174
Merge "resolved conflicts for merge of 409b7120 to master"
2010-08-27 12:05:45 -07:00
Dianne Hackborn
41bfa37cb2
resolved conflicts for merge of 409b7120 to master
...
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
2010-08-27 12:04:26 -07:00
Gilles Debunne
445ab76c49
Merge "Broken build. Missing ;" into gingerbread
2010-08-27 11:52:27 -07:00
Gilles Debunne
0db187a3e6
Broken build. Missing ;
...
Change-Id: Ic266e491a73fb3df00e77111a4ad9f270741c28b
2010-08-27 11:51:34 -07:00
Gilles Debunne
e69b286005
Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread
2010-08-27 11:50:26 -07:00
Brad Fitzpatrick
b94493feaf
Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
2010-08-27 11:49:31 -07:00
Brad Fitzpatrick
c6b0b7755c
Document blocking behavior of ImageView setImageURI and setImageResource
...
Change-Id: I3b0633321229cad80ebf32e052c0db170a56de21
2010-08-27 11:43:56 -07:00
Wink Saville
db4c91ff7b
Merge "Add NetworkProperties to DataConnection."
2010-08-27 11:38:48 -07:00
Brad Fitzpatrick
6b50986a6b
Merge "SharedPreferences$Editor.startCommit()" into gingerbread
2010-08-27 11:21:13 -07:00
Chet Haase
d970432538
Merge "Fix Sequencer end events when terminated early"
2010-08-27 11:15:51 -07:00
Wink Saville
1f6408a96c
Add NetworkProperties to DataConnection.
...
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.
Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
2010-08-27 11:15:18 -07:00
Dianne Hackborn
1040dc465c
Improve clipboard API.
...
- Rename ClippedData to ClipData.
- Introudce ClipDescription subclass.
- Add convenience APIs for creating a ClipData.
- Add ClipboardManager API to get just the ClipDescription.
- Define MIME types associated with a clip.
Change-Id: If97ef91aa99a4dd0ec74ccaea504345c9ef12b5c
2010-08-27 11:06:01 -07:00
Robert Greenwalt
585ac0fc8d
resolved conflicts for merge of 4ea54f44 to master
...
Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56
2010-08-27 11:05:11 -07:00
Dmitri Plotnikov
59024f1697
Unhinding more ContactsContract APIs.
...
Turns out we need more ContactsContract APIs to
be unhidden in order to support unbundled directories.
Change-Id: If212e769bb32cd6806e39217935d189f9d43ea67
2010-08-27 10:59:22 -07:00
Gilles Debunne
d2420248fa
DO NOT MERGE Removed "Stop selecting text" option.
...
Change-Id: Ic553d099664d1703a39139e7440d583cfec20d76
2010-08-27 10:49:14 -07:00
Gilles Debunne
dfad42760f
am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread
...
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp
* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
DO NOT MERGE Text selection: tapping on selection opens context menu
2010-08-27 10:34:56 -07:00
Gilles Debunne
084dd872b1
am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread
...
Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp
* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
Fix for 512 limit in assetManager.list
2010-08-27 10:34:47 -07:00
Gilles Debunne
225ad9cb18
Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread
2010-08-27 10:33:17 -07:00