drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,945 Commits 1 Branch 0 Tags
Commit Graph

30304 Commits

Author SHA1 Message Date
Adam Cohen
16f36e8215 am c9ca7f38: Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev 
* commit 'c9ca7f38bccfa56bbca44998758869ec8c71f4d3':
  Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
 2012-05-01 15:38:35 -07:00
Adam Cohen
c9ca7f38bc Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev 2012-05-01 15:36:21 -07:00
Eric Fischer
de22c77ad8 am dd8412d4: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'dd8412d4fb57fbf53b25460cda8458cdf9dfac07':
  Import translations. DO NOT MERGE
 2012-05-01 13:44:59 -07:00
Eric Fischer
dd8412d4fb Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-01 13:42:13 -07:00
Adam Cohen
ffc46a5c7c Preventing onClickPendingIntents from being set on collection widget items (issue 5961701) 
Change-Id: If60f98c5e1be66ca840cbd4953841ef2c57a012b
 2012-05-01 12:58:12 -07:00
Eric Fischer
48c220df10 Import translations. DO NOT MERGE 
Change-Id: I50b9a3a66234f1570955532c6383570cade19232
 2012-05-01 12:19:31 -07:00
Gilles Debunne
43b32a1cd4 am 8ed491b7: Merge "API fix, AutoCompleteTextView" into jb-dev 
* commit '8ed491b75b08df3944481a9509dea2606a265857':
  API fix, AutoCompleteTextView
 2012-05-01 12:01:05 -07:00
Gilles Debunne
dceca730d3 am 1dcd2bfc: Merge "API fix in TextView" into jb-dev 
* commit '1dcd2bfcabf565aa860fabc69ef54c8d66128a45':
  API fix in TextView
 2012-05-01 12:01:03 -07:00
Gilles Debunne
8ed491b75b Merge "API fix, AutoCompleteTextView" into jb-dev 2012-05-01 11:58:35 -07:00
Gilles Debunne
1dcd2bfcab Merge "API fix in TextView" into jb-dev 2012-05-01 11:58:26 -07:00
Michael Jurka
38abb6bdab am c81a0751: Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 
* commit 'c81a075196a6e0feed452b689ef523e156701f95':
  Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
 2012-05-01 11:50:22 -07:00
Michael Jurka
c81a075196 Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 2012-05-01 11:47:36 -07:00
Winson Chung
0b3d3a3a56 Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)" 
This reverts commit 7ced8f9cabfed2e11c125a1a6b4ff18f1cc50060
 2012-05-01 11:46:09 -07:00
Dianne Hackborn
6d01aea3ef am a25c8a97: Merge "Add new APIs for permission group flags and priorities." into jb-dev 
* commit 'a25c8a97aff5f67a70857e6776bba8b4c517a286':
  Add new APIs for permission group flags and priorities.
 2012-05-01 11:18:16 -07:00
Dianne Hackborn
a25c8a97af Merge "Add new APIs for permission group flags and priorities." into jb-dev 2012-05-01 11:15:51 -07:00
Winson Chung
aa43480538 am 7e400cfb: Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev 
* commit '7e400cfb715858a168add7fa6eaa262ab8ad0695':
  Adding getters/setters for StackView xml attrs. (Bug 6104219)
 2012-05-01 10:58:56 -07:00
Winson Chung
7e400cfb71 Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev 2012-05-01 10:55:14 -07:00
James Dong
e481686464 am 59eaa907: Merge "Fix a race condition in Camera API for handling focus" into jb-dev 
* commit '59eaa907fef9454f6f5ff2ab727eef43bdf7f88d':
  Fix a race condition in Camera API for handling focus
 2012-05-01 10:27:59 -07:00
Amith Yamasani
a6a7e53bf3 am 2d25d467: Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev 
* commit '2d25d467e651048da0dece22c94c0e7e28d0e529':
  Fixes PreferenceScreen padding and scrollbar position.
 2012-05-01 10:25:22 -07:00
James Dong
59eaa907fe Merge "Fix a race condition in Camera API for handling focus" into jb-dev 2012-05-01 10:24:46 -07:00
Amith Yamasani
2d25d467e6 Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev 2012-05-01 10:22:01 -07:00
George Mount
e563b19a82 am 91901aeb: Merge "Fix flicker while selecting text." into jb-dev 
* commit '91901aeb66cf140f50a55e5a8a191585f336432b':
  Fix flicker while selecting text.
 2012-05-01 10:13:20 -07:00
George Mount
91901aeb66 Merge "Fix flicker while selecting text." into jb-dev 2012-05-01 10:10:16 -07:00
Jean-Baptiste Queru
647867ad5a am 63d944d6: am 93a8225e: Merge "Improve robustness of resource overlay test suite." 
* commit '63d944d62e9c85e2b2aa611be1a8d5a6c6ff973f':
  Improve robustness of resource overlay test suite.
 2012-05-01 10:09:21 -07:00
Jean-Baptiste Queru
39b58ba2b2 resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp 
Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
 2012-05-01 09:54:38 -07:00
Jean-Baptiste Queru
63d944d62e am 93a8225e: Merge "Improve robustness of resource overlay test suite." 
* commit '93a8225e54da124807734ff8e4c7790158d06b7c':
  Improve robustness of resource overlay test suite.
 2012-05-01 09:43:31 -07:00
Jean-Baptiste Queru
bc2fb7b92e am 9e3bc3f6: Merge "Build overlay packages just like regular packages." 
* commit '9e3bc3f61df541271c8a1dfc5564cab853951aec':
  Build overlay packages just like regular packages.
 2012-05-01 09:43:25 -07:00
Jean-Baptiste Queru
93a8225e54 Merge "Improve robustness of resource overlay test suite." 2012-05-01 09:20:47 -07:00
George Mount
8072976d7a Fix flicker while selecting text. 
Bug 6413113

Change-Id: I5c8d2cda1eae9d5670c757711c49ccc9e47b4127
 2012-05-01 08:56:24 -07:00
Jean-Baptiste Queru
16e24dd88e am ede38b5c: am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter." 
* commit 'ede38b5c6c93bfd64522357d2075398c79431e1b':
  Fixed group and child view caching in SimpleExpandableListAdapter.
 2012-05-01 08:53:10 -07:00
Jean-Baptiste Queru
c6eda48e0a am e28ccbab: am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"." 
* commit 'e28ccbab9a5634b6d9557240161310451c660e47':
  Fixes an issue that occured unexpected exception "pointerIndex out of range".
 2012-05-01 08:53:05 -07:00
Jean-Baptiste Queru
ede38b5c6c am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter." 
* commit '6a8186fb88455fcc418def0650b7b9f8f3573153':
  Fixed group and child view caching in SimpleExpandableListAdapter.
 2012-05-01 08:50:24 -07:00
Jean-Baptiste Queru
e28ccbab9a am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"." 
* commit '7a0829850ee8d1ee2f436c40c8a5af2ff7d96533':
  Fixes an issue that occured unexpected exception "pointerIndex out of range".
 2012-05-01 08:50:18 -07:00
Jean-Baptiste Queru
9e3bc3f61d Merge "Build overlay packages just like regular packages." 2012-05-01 08:49:38 -07:00
Jean-Baptiste Queru
f6d8e0cafd am 50bd9d61: am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery." 
* commit '50bd9d616695b2162b84a204bc678b83a14f59c9':
  Avoiding horizontal keypad navigation trapping within gallery.
 2012-05-01 06:47:24 -07:00
Jean-Baptiste Queru
2d28f53514 am 31ab51a3: am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items." 
* commit '31ab51a369ab57c82d0271115ba31b3b20ce6e6b':
  Prevent empty overflow popup when there are no overflow items.
 2012-05-01 06:47:21 -07:00
Jean-Baptiste Queru
5e4f01f02d am f59d2912: am bfe71c35: Merge "statistics from some cpus don\'t fit" 
* commit 'f59d2912354a6be6f6181ec945f6f657a5469fb8':
  statistics from some cpus don't fit
 2012-05-01 06:47:15 -07:00
Jean-Baptiste Queru
50bd9d6166 am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery." 
* commit '4426961e7b2eb7733dbb0661c47c6aea2f2f7e75':
  Avoiding horizontal keypad navigation trapping within gallery.
 2012-05-01 06:44:11 -07:00
Jean-Baptiste Queru
31ab51a369 am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items." 
* commit '2066f7d9864d46858588a839a7f39a1526c737bc':
  Prevent empty overflow popup when there are no overflow items.
 2012-05-01 06:44:08 -07:00
Jean-Baptiste Queru
f59d291235 am bfe71c35: Merge "statistics from some cpus don\'t fit" 
* commit 'bfe71c35a836e14b7a9f58d90f26fd187df82b06':
  statistics from some cpus don't fit
 2012-05-01 06:44:01 -07:00
Jean-Baptiste Queru
6a8186fb88 Merge "Fixed group and child view caching in SimpleExpandableListAdapter." 2012-05-01 06:43:03 -07:00
Jean-Baptiste Queru
7a0829850e Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"." 2012-05-01 06:42:12 -07:00
Jean-Baptiste Queru
4426961e7b Merge "Avoiding horizontal keypad navigation trapping within gallery." 2012-05-01 05:52:22 -07:00
Jean-Baptiste Queru
2066f7d986 Merge "Prevent empty overflow popup when there are no overflow items." 2012-05-01 05:52:12 -07:00
Jean-Baptiste Queru
bfe71c35a8 Merge "statistics from some cpus don't fit" 2012-05-01 05:51:49 -07:00
satok
6dbac37981 Merge "Show ongoing ime switch icon on sw600" into jb-dev 2012-04-30 22:02:07 -07:00
Gilles Debunne
f03acef0ab API fix in TextView 
Bug 6104140

Change-Id: I44af54ac7c194335a649e5878ff47dc894fa46fe
 2012-04-30 21:08:41 -07:00
satok
c861b68a52 Show ongoing ime switch icon on sw600 
Bug: 6422307
Change-Id: If10758e0d4ca59da4f3ab07d52dda6673af9c0a8
 2012-05-01 12:05:12 +09:00
Winson Chung
7ced8f9cab Adding getters/setters for StackView xml attrs. (Bug 6104219) 
Change-Id: Iaa1ba0292b0d40f73e315028d9f01ef407021e57
 2012-04-30 18:50:52 -07:00
Dianne Hackborn
414d50bce6 Merge "Fix issue #6234928: android.app.IntentReceiverLeaked:" into jb-dev 2012-04-30 18:29:20 -07:00