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

42280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
d07eaa2388 am b77e727a: am 705a27a9: Merge "Non-editable TextViews should not display a cursor." into honeycomb 
* commit 'b77e727a255da00b2843a0d39efdde91364c8cb1':
  Non-editable TextViews should not display a cursor.
 2011-01-24 14:50:26 -08:00
Gilles Debunne
b77e727a25 am 705a27a9: Merge "Non-editable TextViews should not display a cursor." into honeycomb 
* commit '705a27a97ccd8e363944083d948b7f5204916b85':
  Non-editable TextViews should not display a cursor.
 2011-01-24 14:48:21 -08:00
Gilles Debunne
705a27a97c Merge "Non-editable TextViews should not display a cursor." into honeycomb 2011-01-24 14:46:42 -08:00
Adam Powell
64c2196b39 am 89d90299: am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb 
* commit '89d90299b0c31277d4fe61f644c09cfab4ae44ee':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException
 2011-01-24 14:39:54 -08:00
Adam Powell
89d90299b0 am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb 
* commit 'c831e3192ccd9b2cf69ec7c973005e578631da3b':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException
 2011-01-24 14:37:46 -08:00
Dianne Hackborn
8e11b4f4eb am 81ac92df: am 6d92cde2: am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri" 
* commit '81ac92df33ba146a51fbbf3d5108379a9eb346b1':
  frameworks/base: Track owner in appropriate owners list of Uri
 2011-01-24 14:37:21 -08:00
Jaikumar Ganesh
2f473e4ff9 am 4290211e: (-s ours) am f6439749: (-s ours) am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread 
* commit '4290211eef80c706faea77da2293ccb486c06009':
  Do Not Merge Connect other profiles when priority is auto connect.
 2011-01-24 14:37:18 -08:00
John Reck
8cc4e1b97d am 80a9791b: (-s ours) am 3cc8a3a4: (-s ours) am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread 
* commit '80a9791b1d61db62c597fb041208de3ef4fd9221':
  DO NOT MERGE - Create db path if it doesn't exit
 2011-01-24 14:37:15 -08:00
Jeff Hamilton
921a40fce9 am 9f0fefeb: am 0c5e2b3f: am dc54a8c7: Merge "API changes for NFC." into gingerbread 
* commit '9f0fefeb5ba9717409d04ceff3b36ba5cc4115ad':
  API changes for NFC.
 2011-01-24 14:37:10 -08:00
Xavier Ducrohet
7c2462b915 am b84e3517: am 5b9936f6: Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb 
* commit 'b84e351733e380a3759951ca6042c69b6dc584ad':
  LayoutLib: Use special view cookie for include-merge case.
 2011-01-24 14:37:04 -08:00
Adam Powell
c831e3192c Merge "Fix bug 3382994 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-24 14:35:11 -08:00
Dianne Hackborn
81ac92df33 am 6d92cde2: am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri" 
* commit '6d92cde287b6399d5c90f3eaccb73602d6d51313':
  frameworks/base: Track owner in appropriate owners list of Uri
 2011-01-24 14:34:46 -08:00
Jeff Hamilton
ff4e6f58d6 am 0ccac6e3: Merge "Merge commit \'446aea40\' into manualmerge" into honeycomb-plus-aosp 
* commit '0ccac6e3ee687930d411be69b3bb6904656d128d':
  API changes for NFC.
 2011-01-24 14:34:46 -08:00
Jaikumar Ganesh
4290211eef am f6439749: (-s ours) am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread 
* commit 'f643974954c47c95cd84c774db7f1e3997ee9c96':
  Do Not Merge Connect other profiles when priority is auto connect.
 2011-01-24 14:34:40 -08:00
John Reck
80a9791b1d am 3cc8a3a4: (-s ours) am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread 
* commit '3cc8a3a47ede49b8699c2a839626a44f2d57cd73':
  DO NOT MERGE - Create db path if it doesn't exit
 2011-01-24 14:34:30 -08:00
Jeff Hamilton
9f0fefeb5b am 0c5e2b3f: am dc54a8c7: Merge "API changes for NFC." into gingerbread 
* commit '0c5e2b3f1377b3b52c535a1f95899830f5de0347':
  API changes for NFC.
 2011-01-24 14:34:09 -08:00
Xavier Ducrohet
b84e351733 am 5b9936f6: Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb 
* commit '5b9936f651a06b4b3c988ee330d12355041eeb00':
  LayoutLib: Use special view cookie for include-merge case.
 2011-01-24 14:33:28 -08:00
Jeff Hamilton
0ccac6e3ee Merge "Merge commit '446aea40' into manualmerge" into honeycomb-plus-aosp 2011-01-24 14:32:13 -08:00
Jeff Hamilton
b0cae14175 Merge commit '446aea40' into manualmerge 
Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
 2011-01-24 16:31:38 -06:00
Xavier Ducrohet
5b9936f651 Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb 2011-01-24 14:31:28 -08:00
Adam Powell
55767443ad Fix bug 3382994 - android.view.WindowManager$BadTokenException 
Remove pending callbacks when ActionMenuView is detached.

Change-Id: Ia61e446f60f10dd82476c00b4c11177182e7db60
 2011-01-24 14:28:37 -08:00
Adam Powell
1511cd10c4 am 6e274c5e: am bffb0a25: Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb 
* commit '6e274c5e1dfa6a98110ebc0ec0a4ce1924fa7c53':
  Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon
 2011-01-24 14:28:24 -08:00
Adam Powell
6e274c5e1d am bffb0a25: Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb 
* commit 'bffb0a2586751fc409e57cee5382cfd2ec6543de':
  Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon
 2011-01-24 14:26:01 -08:00
Adam Powell
bffb0a2586 Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb 2011-01-24 14:23:36 -08:00
Xavier Ducrohet
82b9232565 LayoutLib: Use special view cookie for include-merge case. 
All items directly under the <merge> tag now return the view cookie
of the referencing <include> tag using a special class for
easy differentiation in the calling client.

Change-Id: I7a2a4e642be9564f47e256fd1586012497d34792
 2011-01-24 14:14:53 -08:00
Andreas Huber
f47bfa0199 am 54bce526: am bc5172fe: Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb 
* commit '54bce526bf1062093d012853ae6ed2eb68e37e26':
  Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
 2011-01-24 14:04:12 -08:00
Adam Powell
abbcc241c0 Fix bug 3237638 - make it easy to change a "refresh" AB button/icon 
into the indeterminate progress icon

This fixes a bug that caused ActionViews to not be updated properly
after a pass through invalidateOptionsMenu/onPrepareOptionsMenu. Apps
can now set/clear action views to display progress spinner widgets or
anything else on demand.

Change-Id: I138eceb504177c6bb5b86d40a68a82973aa841a5
 2011-01-24 14:03:16 -08:00
Andreas Huber
54bce526bf am bc5172fe: Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb 
* commit 'bc5172fe662104e2558b0841fcf82035398e5cac':
  Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
 2011-01-24 14:00:59 -08:00
Eric Fischer
4222612d9a am 6d6f04b6: (-s ours) am f7358996: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '6d6f04b6bb4d13967cafec323ce6d1fcf2230b6e':
  Import revised translations.  DO NOT MERGE
 2011-01-24 13:58:36 -08:00
Andreas Huber
bc5172fe66 Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb 2011-01-24 13:57:11 -08:00
Eric Fischer
6d6f04b6bb am f7358996: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'f7358996d38c3552344e225ce2f3455089be715c':
  Import revised translations.  DO NOT MERGE
 2011-01-24 13:49:25 -08:00
Eric Fischer
f7358996d3 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-24 13:46:28 -08:00
Andreas Huber
8b1893f69e am 5481142a: am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb 
* commit '5481142a0358f72c192d5a7e7f50cda77106309e':
  The .mkv parser lib leaves some tracks NULL if it doesn't support them.
 2011-01-24 13:37:40 -08:00
Huahui Wu
61b9649a50 am 6e4a69bb: am 94b8b114: Merge "A few small cleanning-ups." into honeycomb 
* commit '6e4a69bbf7d7566899ec76d2634538dd79ca4166':
  A few small cleanning-ups.
 2011-01-24 13:36:39 -08:00
Dianne Hackborn
d78da53334 am 21e7ba24: am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit '21e7ba2451fdbc3e69468222638d5ee99eb44c30':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-24 13:36:33 -08:00
Andreas Huber
a8385dd7c1 Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder 
Change-Id: Ia22ebce66d9c35de4b04c3eedc9495847796901d
related-to-bug: 3384367
 2011-01-24 13:36:30 -08:00
Daniel Sandler
751087c3b1 am c0d6b8d7: am 1e25a23f: Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 
* commit 'c0d6b8d7fb330c4e09a9e66967835a9a55804e8d':
  Vertically align SSID/PLMN on lockscreen.
 2011-01-24 13:33:00 -08:00
Justin Ho
07800cd4c2 am f8a93b4b: am 7040e33c: Merge "Updated checkbox assets for legacy applications" into honeycomb 
* commit 'f8a93b4ba2a73e5c8271d1fe23853b83a03e1583':
  Updated checkbox assets for legacy applications
 2011-01-24 13:32:52 -08:00
Andreas Huber
5481142a03 am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb 
* commit 'c45d3ad08469eb4c519a5aeef74f6d914e674144':
  The .mkv parser lib leaves some tracks NULL if it doesn't support them.
 2011-01-24 13:31:27 -08:00
Andreas Huber
b73f4208f0 am bd6ac1e4: am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb 
* commit 'bd6ac1e4d444e69d31677fec41d4d1a265098f08':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)
 2011-01-24 13:31:00 -08:00
Santosh Madhava
01a9c0289e am 47254778: am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb 
* commit '47254778584db8d7a8b9ff17e3704fbdf18fa348':
  Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
 2011-01-24 13:30:54 -08:00
Joe Onorato
b05aacc1ae am ab8967ae: am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb 
* commit 'ab8967ae9db71291094da2967e744038b7e91ff7':
  Remove unwanted parameter (it was a typo).
 2011-01-24 13:30:42 -08:00
Chet Haase
3873da3c6e am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb 
* commit '2acb67ec9fe34316231519373f59dfb76c03d57b':
  Use optimized display lists for all hwaccelerated rendering
 2011-01-24 13:30:37 -08:00
Daniel Sandler
222b8e2569 am 99b8041c: am 78b32fc4: Merge "Smoothly hide the list when there are no notifications." into honeycomb 
* commit '99b8041cc6bef1983f7a30adf0e2f0a751a18d3a':
  Smoothly hide the list when there are no notifications.
 2011-01-24 13:30:30 -08:00
Gilles Debunne
161bfdd0ce am 971bdb3a: am 7108724d: Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb 
* commit '971bdb3a24582ab1f09745cdef1ec906ff13b7f9':
  New fix for popup behavior in AutoCompleteTextViews.
 2011-01-24 13:30:23 -08:00
satok
ff0ada3767 am 47f92f47: am 57ffc002: Add a way that subtype will be excluded from a last input method 
* commit '47f92f479cb2c6c18de4c1e429531d0c04e90472':
  Add a way that subtype will be excluded from a last input method
 2011-01-24 13:30:18 -08:00
Andreas Huber
c45d3ad084 Merge "The .mkv parser lib leaves some tracks NULL if it doesn't support them." into honeycomb 2011-01-24 13:29:58 -08:00
Jean-Michel Trivi
477e035995 am dc871fd8: resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp 
* commit 'dc871fd870972bd704d720fae45bcbbcc5905173':
  Bug 3365937 notify TTS initialization listener of binding errors
 2011-01-24 13:29:58 -08:00
Eric Laurent
ea2d06d396 am f6a61c0a: (-s ours) am 39999e3a: (-s ours) am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread 
* commit 'f6a61c0abcf5834979245bb596f99f6257f43e5a':
  do not merge - Fix issue 3371096.
 2011-01-24 13:29:24 -08:00
Dianne Hackborn
995af7e38b am acba73c1: am 19fdccfd: (-s ours) am 11576102: Fix issue #3373438: Update GBMR versions 
* commit 'acba73c100e53c66bc45e87d8082a9b3e07e0cff':
  Fix issue #3373438: Update GBMR versions
 2011-01-24 13:28:55 -08:00