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

41329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Huahui Wu
6e4a69bbf7 am 94b8b114: Merge "A few small cleanning-ups." into honeycomb 
* commit '94b8b114ab9abf5ccad6b85deb08aac2a359915d':
  A few small cleanning-ups.
 2011-01-24 13:27:25 -08:00
Huahui Wu
94b8b114ab Merge "A few small cleanning-ups." into honeycomb 2011-01-24 13:25:17 -08:00
Dianne Hackborn
21e7ba2451 am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit '15efe4cb4c7d5bd19266ff740b1a3c8a703cd3a9':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-24 13:23:43 -08:00
Daniel Sandler
c0d6b8d7fb am 1e25a23f: Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 
* commit '1e25a23f9d5319267e48242b1dd655697da4a175':
  Vertically align SSID/PLMN on lockscreen.
 2011-01-24 13:16:38 -08:00
Daniel Sandler
1e25a23f9d Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 2011-01-24 13:14:35 -08:00
Justin Ho
f8a93b4ba2 am 7040e33c: Merge "Updated checkbox assets for legacy applications" into honeycomb 
* commit '7040e33c183f431531bd68b23c6d69d31eb1a173':
  Updated checkbox assets for legacy applications
 2011-01-24 12:58:00 -08:00
Justin Ho
7040e33c18 Merge "Updated checkbox assets for legacy applications" into honeycomb 2011-01-24 12:55:29 -08:00
Gilles Debunne
98dbfd4940 Non-editable TextViews should not display a cursor. 
Bug 3381320

The tests were inconsistent between makeBlink and onDraw.
If the text is non-editable, do not draw the cursor.

Change-Id: I0405e59444261a553e868b3ae5bdddd278f60bb2
 2011-01-24 12:54:10 -08:00
Daniel Sandler
bfa8983b65 Vertically align SSID/PLMN on lockscreen. 
Bug: 3373818
Change-Id: Ie20584c5247bd52e376ddcb97205ba967ce3a8ea
 2011-01-24 15:52:46 -05:00
Andreas Huber
dfe8d9b1ff The .mkv parser lib leaves some tracks NULL if it doesn't support them. 
But it still counts them as valid tracks...

Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0
related-to-bug: 3377186
 2011-01-24 12:46:12 -08:00
Eric Fischer
a1a8d941c2 Import revised translations. DO NOT MERGE 
Change-Id: I4babd2856874af87e991dab0f5c9696e54ca49b4
 2011-01-24 12:35:32 -08:00
Huahui Wu
f93246923f A few small cleanning-ups. 
1. Remove mDeferMultiTouch in WebView, it was for testing only but
we don't need it now since we always pass MultiTouch to WebKit.

2. Remove the use of mDeferMultiTouch in DRT tests.

3. Correct the index of getX(Y) for the second touch point in the
debug string of MotionEvent.

Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
 2011-01-24 12:07:37 -08:00
Justin Ho
ec42272205 Updated checkbox assets for legacy applications 
Change-Id: I30c39101b365a0bcc78e1b5ff67a9d2ae732e5ae
 2011-01-24 12:07:37 -08:00
Andreas Huber
bd6ac1e4d4 am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb 
* commit 'da6f9295840b0e74f61afa273ce2a767d8148af7':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)
 2011-01-24 11:16:57 -08:00
Santosh Madhava
4725477858 am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb 
* commit '36486912595525a3ec4f0027deeb91d318ec4d9d':
  Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
 2011-01-24 11:16:54 -08:00
Joe Onorato
ab8967ae9d am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb 
* commit 'da34e13bb4ef97832c43489937a26d314437a1d7':
  Remove unwanted parameter (it was a typo).
 2011-01-24 11:16:43 -08:00
Chet Haase
2acb67ec9f am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb 
* commit '67005b05cc76a38a5b3bf6e83957dd03619e9126':
  Use optimized display lists for all hwaccelerated rendering
 2011-01-24 11:15:51 -08:00
Daniel Sandler
99b8041cc6 am 78b32fc4: Merge "Smoothly hide the list when there are no notifications." into honeycomb 
* commit '78b32fc4517f8fef8a73f9b31c9baa2e530ef8bc':
  Smoothly hide the list when there are no notifications.
 2011-01-24 11:15:42 -08:00
Gilles Debunne
971bdb3a24 am 7108724d: Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb 
* commit '7108724d4b6a1c2862154cd52ed4fb1e5f001186':
  New fix for popup behavior in AutoCompleteTextViews.
 2011-01-24 11:15:38 -08:00
satok
47f92f479c am 57ffc002: Add a way that subtype will be excluded from a last input method 
* commit '57ffc00239edcfe733832771e1429fca20182207':
  Add a way that subtype will be excluded from a last input method
 2011-01-24 11:15:20 -08:00
Andreas Huber
da6f929584 Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb 2011-01-24 10:45:59 -08:00
Santosh Madhava
3648691259 Merge "Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'" into honeycomb 2011-01-24 10:45:36 -08:00
Joe Onorato
da34e13bb4 Merge "Remove unwanted parameter (it was a typo)." into honeycomb 2011-01-24 10:43:55 -08:00
Andreas Huber
aac2e9e156 Make AwesomePlayer's reset process more verbose to track down ANRs (again) 
Change-Id: I0d66994cc4295fd5ceeaaf151ce913ed0dd995f9
related-to-bug: 3362836
 2011-01-24 10:31:52 -08:00
Santosh Madhava
4ff8a0b410 Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0' 
Change-Id: Id2e4598f29191c506ab99a112bd7743f6a794cd6
 2011-01-24 10:17:05 -08:00
Jean-Michel Trivi
dc871fd870 resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp 
Change-Id: Ifd5f88f75feeb2dad1131e6a262dff3b979bdf8d
 2011-01-24 09:35:57 -08:00