Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,640 Commits 3 Branches 0 Tags
aa73eec4bba024549ee2df220a0b9b8159bdbe7b
Commit Graph

8091 Commits

Author SHA1 Message Date
Jaikumar Ganesh
b677225fc1 Merge "Relax the requirement of making a DBUS call for creating the Bluez Device." 2010-03-30 09:19:56 -07:00
Bjorn Bringert
742437f2b3 am 76b2ff33: am 3f434566: am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting 2010-03-30 04:12:59 -07:00
Bjorn Bringert
76b2ff3391 am 3f434566: am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting 
Merge commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2' into kraken

* commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2':
  Clean up SearchableInfo API, JavaDoc and formatting
 2010-03-30 04:06:03 -07:00
Bjorn Bringert
3f434566ff am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting 
Merge commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp

* commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
  Clean up SearchableInfo API, JavaDoc and formatting
 2010-03-30 03:59:36 -07:00
Bjorn Bringert
fef8cebcdc Clean up SearchableInfo API, JavaDoc and formatting 
This change cleans up the JavaDoc in SearchableInfo,
removes trailing whitespace, fixes an if-statement
style violoation, and re-hides some things that were
exposed for Froyo that query deprecated or discouraged
attributes:

SearchableInfo.getSearchButtonText()
SearchableInfo.getLabelId()
SearchableInfo.getIconlId()
class SearchableInfo.ActionKeyInfo
SearchableInfo.findActionKey()

Bug http://b/issue?id=2553524

Change-Id: Iee5521c844f74137166730e523d29ba07ef1856b
 2010-03-30 11:40:34 +01:00
Adam Powell
1aed070562 am ecf4406c: am 370fe2a9: am 9d32d24d: Remove overscrolling 2010-03-29 21:16:37 -07:00
Adam Powell
ecf4406ce5 am 370fe2a9: am 9d32d24d: Remove overscrolling 
Merge commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06' into kraken

* commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06':
  Remove overscrolling
 2010-03-29 21:09:28 -07:00
Adam Powell
370fe2a91e am 9d32d24d: Remove overscrolling 
Merge commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp

* commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
  Remove overscrolling
 2010-03-29 21:02:47 -07:00
Adam Powell
9d32d24dbd Remove overscrolling 
Change-Id: I7e9db8d8a9b8ef67f0c0c82bf57c9155b7ebabea
 2010-03-29 20:46:45 -07:00
Oscar Montemayor
1ec71365f9 am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 
Merge commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp

* commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740':
  DO NOT MERGE
 2010-03-29 19:01:16 -07:00
Oscar Montemayor
f5f300678a Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 2010-03-29 18:56:57 -07:00
Charles Chen
6d3e41cce3 am e549ce98: am 629d03f1: am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 2010-03-29 18:52:47 -07:00
Charles Chen
e549ce98cf am 629d03f1: am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 
Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken

* commit '629d03f12251220daf26abc5be86d4649318a331':
  Fix for bug 2548048 - it was impossible for applications to discover
 2010-03-29 18:44:59 -07:00
Charles Chen
629d03f122 am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp

* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
  Fix for bug 2548048 - it was impossible for applications to discover
 2010-03-29 18:41:48 -07:00
Amith Yamasani
7666f580c6 am 51e2c991: am e7eb3a35: am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 2010-03-29 18:41:39 -07:00
Charles Chen
a599dafe4f Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 2010-03-29 18:37:41 -07:00
Charles Chen
42229259a6 Fix for bug 2548048 - it was impossible for applications to discover 
if their TTS settings were being overridden by the user or not.

Change-Id: I28856a1b79c9455435671d13ed614a1ccb4e95ea
 2010-03-29 18:35:30 -07:00
Amith Yamasani
51e2c99160 am e7eb3a35: am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 
Merge commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken

* commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
  Fix preloaded classes for API rename of BackupAgentHelper
 2010-03-29 18:33:55 -07:00
Amith Yamasani
e7eb3a35fe am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp

* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
  Fix preloaded classes for API rename of BackupAgentHelper
 2010-03-29 18:28:14 -07:00
Oscar Montemayor
1f4df90bfa DO NOT MERGE 
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
 2010-03-29 18:12:24 -07:00
Amith Yamasani
03aa34f50d Fix preloaded classes for API rename of BackupAgentHelper 
Change-Id: Ica6301b2aac6879702b98edfcf67fc7bc62002db
 2010-03-29 18:11:56 -07:00
Romain Guy
6c48e1ab78 am 9634e349: am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:52:23 -07:00
Ben Cheng
b14fe53afc am 08eac7d5: am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 2010-03-29 16:52:19 -07:00
Steve Howard
077b683d5a am 8bb0fc7f: am e9cd68f1: am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 2010-03-29 16:52:15 -07:00
Romain Guy
9634e3496d am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 
Merge commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken

* commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c':
  Fix possible security issue.
 2010-03-29 16:40:43 -07:00
Romain Guy
1faae16772 am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 
Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp

* commit '691b806ff8b4a6428588e8495cb1a5819a0aee99':
  Fix possible security issue.
 2010-03-29 16:34:46 -07:00
Ben Cheng
08eac7d5cd am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Merge commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken

* commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
 2010-03-29 16:32:11 -07:00
Steve Howard
8bb0fc7f89 am e9cd68f1: am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 
Merge commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc' into kraken

* commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc':
  Remove upside-down portrait orientation.
 2010-03-29 16:32:05 -07:00
Romain Guy
691b806ff8 Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:31:14 -07:00
Ben Cheng
8d0dc62fe2 am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp

* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
 2010-03-29 16:25:13 -07:00
Steve Howard
e9cd68f181 am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 
Merge commit '8deb239169f9b60cf19b6f4293978e654fa15a03' into froyo-plus-aosp

* commit '8deb239169f9b60cf19b6f4293978e654fa15a03':
  Remove upside-down portrait orientation.
 2010-03-29 16:25:09 -07:00
Ben Cheng
ef3f5ddc21 Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Bug: 2553512
Change-Id: Id0dad80ecdcb8c7430dcf1ac26132ccd9c0770f5
 2010-03-29 16:17:58 -07:00
Christopher Tate
de0d50f8b7 am 2eb13d3f: am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 2010-03-29 16:07:47 -07:00
Steve Howard
8deb239169 Merge "Remove upside-down portrait orientation." into froyo 2010-03-29 16:05:35 -07:00
Romain Guy
2aba11f6b9 Fix possible security issue. 
Bug #2553187

Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.

Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
 2010-03-29 16:03:01 -07:00
Christopher Tate
2eb13d3f46 am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 
Merge commit '245df5ad16ff227761906c10dc97c01901232666' into kraken

* commit '245df5ad16ff227761906c10dc97c01901232666':
  API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
 2010-03-29 15:57:01 -07:00
Christopher Tate
245df5ad16 am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp

* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
  API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
 2010-03-29 15:53:54 -07:00
Dirk Dougherty
eb7aca1dea am 5bfa807a: am 6c754559: am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 2010-03-29 15:51:35 -07:00
Jim Miller
e33b93206b am baaa33a3: am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:51:26 -07:00
Christopher Tate
3f264c4fba Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 2010-03-29 15:50:57 -07:00
Christopher Tate
cc84c69726 API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council 
Part of bug #2545514

Change-Id: Ic775e3b942c485252149c1b6c15c88517fa4e3e5
 2010-03-29 15:48:14 -07:00
Dirk Dougherty
5bfa807a6f am 6c754559: am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 
Merge commit '6c75455908579c1bd48777847c0861967bc413a9' into kraken

* commit '6c75455908579c1bd48777847c0861967bc413a9':
  doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
 2010-03-29 15:43:23 -07:00
Dirk Dougherty
6c75455908 am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp

* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
  doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
 2010-03-29 15:39:56 -07:00
Dirk Dougherty
c46f28dc0f Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 2010-03-29 15:36:53 -07:00
Jim Miller
baaa33a378 am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo 
Merge commit 'd41d458696b2ab54387dd0683a3365e788b97c2d' into kraken

* commit 'd41d458696b2ab54387dd0683a3365e788b97c2d':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
 2010-03-29 15:14:27 -07:00
Romain Guy
b741169d7e am 2aba9b1e: am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595 2010-03-29 15:14:13 -07:00
Jim Miller
d41d458696 am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo 
Merge commit 'c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp

* commit 'c6dc5070ef663e514add038b1d2e78761156b0c0':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
 2010-03-29 15:11:01 -07:00
Jim Miller
c6dc5070ef Merge "Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:07:06 -07:00
Romain Guy
2aba9b1e21 am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595 
Merge commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f' into kraken

* commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f':
  Rename tab widget attributes, remove scroll barrier constant.
 2010-03-29 15:05:11 -07:00
Romain Guy
21ad6043cd am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595 
Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp

* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
  Rename tab widget attributes, remove scroll barrier constant.
 2010-03-29 14:49:09 -07:00