Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,410 Commits 3 Branches 0 Tags
6a3ffb5beeb6d88c5c1916bef60265f73f9e1822
Commit Graph

11460 Commits

Author SHA1 Message Date
Dianne Hackborn
6a3ffb5bee am df3a0f50: Merge "Improve doc." into gingerbread 
Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp

* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
  Improve doc.
 2010-09-03 15:18:39 -07:00
Dianne Hackborn
df3a0f50c3 Merge "Improve doc." into gingerbread 2010-09-03 15:15:50 -07:00
Dianne Hackborn
170bae7d83 Improve doc. 
Change-Id: I841b04e1e455b6236fb8b65b965f2fc25c4461f0
 2010-09-03 15:14:28 -07:00
Dianne Hackborn
fd3f44b388 am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread 
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp

* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
  Adding a feature denoting support for 5 or more fully
 2010-09-03 15:10:24 -07:00
Dan Morrill
6993d3d136 Adding a feature denoting support for 5 or more fully 
independent multitouch pointers.

Change-Id: I9997ed9c481dbd507e9eff70d8beb9e1140cca3f
 2010-09-03 14:41:36 -07:00
Adam Powell
f9a1ff4173 am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 
Merge commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp

* commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f':
  Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
 2010-09-03 14:00:41 -07:00
Adam Powell
e7c02ef40a Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 2010-09-03 13:58:37 -07:00
Dianne Hackborn
3d7d3690de am e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp

* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
  These are not ready to be exposed.  Also rename them to be better.
 2010-09-03 13:26:30 -07:00
Dianne Hackborn
e25b4bc76f Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 2010-09-03 13:24:33 -07:00
Dianne Hackborn
482566ed5c These are not ready to be exposed. Also rename them to be better. 
Change-Id: I7c234144497084b7769f8c46761b7d74d1c583d5
 2010-09-03 12:51:28 -07:00
Brad Fitzpatrick
9eb32c96c8 am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp

* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
  More SharedPreferences commit() -> apply() changes.
 2010-09-03 12:49:44 -07:00
Adam Powell
e6ffce9f65 Fix bug 2973252 - Make overscroll glow respect ifContentScrolls 
Change-Id: I0e4bf09c0cbc660c9b8d26a3526b09568c05e93d
 2010-09-03 12:06:51 -07:00
Brad Fitzpatrick
fa8e271636 More SharedPreferences commit() -> apply() changes. 
Change-Id: Ibc844d72d463434722a349f5bbc02889a9feb0ee
 2010-09-03 11:18:28 -07:00
Gilles Debunne
ece9e19478 am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp

* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
 2010-09-02 15:34:24 -07:00
Gilles Debunne
d180232e92 Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 2010-09-02 15:29:14 -07:00
Gilles Debunne
d4723bb415 Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread" 
This reverts commit 26d708d936, reversing
changes made to 3ac85d31de.

Change-Id: Ifc19f837bee7437707ddddf0b19cb6bce53dd2c5
 2010-09-02 15:27:47 -07:00
Eric Rowe
4ca550a17b am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests. 
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp

* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
  Add BT test instrumentation for reboot tests.
 2010-09-02 14:59:00 -07:00
Gilles Debunne
5402c34b27 am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread 
Merge commit '26d708d93624d2d060529b7e33e0a20172e85efd' into gingerbread-plus-aosp

* commit '26d708d93624d2d060529b7e33e0a20172e85efd':
  InputMethodManager showSoftInput return documentation.
 2010-09-02 14:55:51 -07:00
Eric Rowe
947e25e5ff am ac3c1f55: Add BT test instrumentation for reboot tests. 
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread

* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
  Add BT test instrumentation for reboot tests.
 2010-09-02 14:55:47 -07:00
Gilles Debunne
26d708d936 Merge "InputMethodManager showSoftInput return documentation." into gingerbread 2010-09-02 14:50:25 -07:00
Daisuke Miyakawa
fa5a46a08e am 3010713f: Fix again. 
Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp

* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
  Fix again.
 2010-09-02 13:54:48 -07:00
Daisuke Miyakawa
3010713f50 Fix again. 
Change-Id: I7393e1e9e9aa3f8612d143840109f1c5193f692f
 2010-09-02 13:48:09 -07:00
Daisuke Miyakawa
b2b973d13e am 3bd9b8f0: Fix build breakage. 
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp

* commit '3bd9b8f04cece37ab4405abc382e2810006b9f97':
  Fix build breakage.
 2010-09-02 13:46:55 -07:00
Daisuke Miyakawa
3bd9b8f04c Fix build breakage. 
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
 2010-09-02 13:42:22 -07:00
Daisuke Miyakawa
22a17ce60b am b1f5a54a: Merge "VCard refactoring backport." into gingerbread 
Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp

* commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7':
  VCard refactoring backport.
 2010-09-02 12:59:36 -07:00
Daisuke Miyakawa
b1f5a54a2a Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Eric Rowe
6aa717e4a1 am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp

* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 11:37:51 -07:00
Eric Rowe
97e58ef444 Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 2010-09-02 11:35:20 -07:00
Eric Rowe
13438b0205 DO NOT MERGE Separate utility methods into utility class. 
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close().  The constructor
is derived from setUp() and close() from tearDown().

Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
 2010-09-02 11:29:59 -07:00
Daisuke Miyakawa
69831d9dc1 VCard refactoring backport. 
Change-Id: Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
 2010-09-02 10:39:00 -07:00
Adam Powell
0358def776 am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp

* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
 2010-09-02 00:31:03 -07:00
Adam Powell
79492a0d75 Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks. 
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
 2010-09-02 00:14:53 -07:00
Dianne Hackborn
840f0fecd8 am d3efa392: Clean up some permissions. 
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp

* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
  Clean up some permissions.
 2010-09-01 22:51:35 -07:00
Dianne Hackborn
d3efa39244 Clean up some permissions. 
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.

Also deprecate the activity API to go in the foreground.  I didn't
realize that was released in the SDK.  It needs to go away.

Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
 2010-09-01 21:19:40 -07:00
Dianne Hackborn
14d56840ee am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread 
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp

* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
  Improve messages when java process is starting.
 2010-09-01 21:18:31 -07:00
Dianne Hackborn
bc5ec2f91a Merge "Improve messages when java process is starting." into gingerbread 2010-09-01 21:15:17 -07:00
Dianne Hackborn
08e60f2a16 Improve messages when java process is starting. 
Change-Id: I33e401eb240a454845987c10d44e3520e419721b
 2010-09-01 19:17:47 -07:00
Jason Chen
9fadca71e4 am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp

* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
 2010-09-01 19:16:41 -07:00
Jason Chen
b766ab830a DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.

Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
 2010-09-01 19:04:18 -07:00
Hung-ying Tyan
3e4975a52c am 3424c02e: Add software features for SIP and VOIP 
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp

* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
  Add software features for SIP and VOIP
 2010-09-01 18:01:31 -07:00
Hung-ying Tyan
3424c02e6b Add software features for SIP and VOIP 
and block SipService creation and SIP API if the feature is not available.

Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
 2010-09-02 08:10:13 +08:00
Dan Morrill
61f1cbdd71 am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread 
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp

* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
  Adding a feature definition corresponding to support for Near-Field
 2010-09-01 15:05:34 -07:00
Dan Morrill
76437d3793 Adding a feature definition corresponding to support for Near-Field 
Communications (NFC).

Change-Id: I32b1b949524bfd978f53e23e02d38dfba4a2ea9c
 2010-09-01 14:42:23 -07:00
Adam Powell
6fb81376b6 am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp

* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
  DO NOT MERGE Integrate edge effects into WebView.
 2010-09-01 14:01:44 -07:00
Adam Powell
e34fe69e66 Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 2010-09-01 13:57:05 -07:00
Adam Powell
230269d43b DO NOT MERGE Integrate edge effects into WebView. 
TODO Effect for scaling gestures; asset/polish tweaks.

Change-Id: Ifbc201cb64e0610dbc92a7c57ba0d3a4ee686c43
 2010-09-01 11:56:56 -07:00
Daniel Sandler
9ce879636e am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread 
Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp

* commit 'b1387127f18b73d7f1038dad6e432329b78264ae':
  Fix build (restore deleted assets).
 2010-09-01 11:48:19 -07:00
Daniel Sandler
b1387127f1 Merge "Fix build (restore deleted assets)." into gingerbread 2010-09-01 11:46:16 -07:00
Daniel Sandler
a3c3edc68f Fix build (restore deleted assets). 
Change-Id: I89362191131e2e8e3d276ab8444edd0d5041211c
 2010-09-01 14:43:59 -04:00