ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
27,406 Commits 2 Branches 0 Tags 54 MiB
f348fdcdf5
Commit Graph

27406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
f348fdcdf5 am 532c1455: Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb 
* commit '532c145540950fd3fa35d9099abdd2e4cb7d5776':
  Fix bug 3383867 - default height for dropdown list items in framework layouts
 2011-01-24 17:26:50 -08:00
Adam Powell
5bd1887e9b Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb 2011-01-24 17:24:25 -08:00
Jim Miller
895b40f98b am d2d31dad: Merge "Fix 3381660: Update PasswordUnlock screen\'s EditText background." into honeycomb 
* commit 'd2d31dadb02b45bf938761bfb6264dc599d81b3d':
  Fix 3381660: Update PasswordUnlock screen's EditText background.
 2011-01-24 17:17:18 -08:00
James Dong
06d0d0aa28 am 9807a7b2: Merge "Reduce the JNI native method visibility" into honeycomb 
* commit '9807a7b27047c4108e3b2f802a814d4f746898cc':
  Reduce the JNI native method visibility
 2011-01-24 17:14:51 -08:00
Jim Miller
0b67314a43 Merge "Fix 3381660: Update PasswordUnlock screen's EditText background." into honeycomb 2011-01-24 17:13:30 -08:00
James Dong
79d6d4e17f Merge "Reduce the JNI native method visibility" into honeycomb 2011-01-24 17:12:36 -08:00
Chet Haase
4c03b63ee4 am 50d4de21: Merge "Fix bug with display lists and layout." into honeycomb 
* commit '50d4de21ee6a2ee62c7ad89dfdfd82d1045e7a58':
  Fix bug with display lists and layout.
 2011-01-24 17:07:13 -08:00
Jim Miller
5538723933 am 85d3ef33: Merge "Fix 3381304: disable key preview in LockScreen\'s qwerty keyboard" into honeycomb 
* commit '85d3ef337bdd21109e9c29356a6df96aacb3f849':
  Fix 3381304: disable key preview in LockScreen's qwerty keyboard
 2011-01-24 17:04:51 -08:00
Chet Haase
13a1ff2a09 Merge "Fix bug with display lists and layout." into honeycomb 2011-01-24 17:03:30 -08:00
Jim Miller
41637fc451 Merge "Fix 3381304: disable key preview in LockScreen's qwerty keyboard" into honeycomb 2011-01-24 17:03:07 -08:00
Jeff Brown
ec43113f4e am 8bb7e488: Merge "Fix regression setting input windows." into honeycomb 
* commit '8bb7e488e2564b75d8d920850891675090debcca':
  Fix regression setting input windows.
 2011-01-24 17:00:28 -08:00
Jeff Brown
dbc8fa1cbe Merge "Fix regression setting input windows." into honeycomb 2011-01-24 16:58:17 -08:00
Stephen Hines
91c5889347 am 3dd0908a: Merge "Add missing functions to math library." into honeycomb 
* commit '3dd0908a65095cb6946001ae3039ab87a47b4f33':
  Add missing functions to math library.
 2011-01-24 16:16:35 -08:00
Stephen Hines
816914d103 Merge "Add missing functions to math library." into honeycomb 2011-01-24 16:14:43 -08:00
Jeff Brown
14f05ef174 am aaa55d3f: Merge "New orientation listener." into honeycomb 
* commit 'aaa55d3f45744814907d0809befb49281ced462e':
  New orientation listener.
 2011-01-24 15:33:46 -08:00
Jeff Brown
b0355c5b0d Merge "New orientation listener." into honeycomb 2011-01-24 15:31:22 -08:00
Svetoslav Ganov
ccf7a1174c am 33322052: Merge "DatePicker is picking the wrong date" into honeycomb 
* commit '33322052edd6c77b4378e69b66f746f241a80764':
  DatePicker is picking the wrong date
 2011-01-24 15:28:30 -08:00
Svetoslav Ganov
4465fa24c3 Merge "DatePicker is picking the wrong date" into honeycomb 2011-01-24 15:26:42 -08:00
Adam Powell
6aee302406 am 1914971c: Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb 
* commit '1914971c6bdeac330846488fdd5c0bb4120d5624':
  Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible
 2011-01-24 15:06:28 -08:00
Leon Scroggins
0a11bdf7b0 am 8801ad35: Merge "Disable focus controller when WebView loses focus." into honeycomb 
* commit '8801ad35264b6780697fcdcfbac0e17c7ca2d771':
  Disable focus controller when WebView loses focus.
 2011-01-24 15:04:19 -08:00
Adam Powell
6314bea24b Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb 2011-01-24 15:03:16 -08:00
Leon Scroggins
8362ee8894 Merge "Disable focus controller when WebView loses focus." into honeycomb 2011-01-24 15:02:10 -08:00
Gilles Debunne
b005b0f904 am 7c8c6d68: Typo in InputMethodManager\'s documentation 
* commit '7c8c6d689280ecfbd151a2e0cb40341768470676':
  Typo in InputMethodManager's documentation
 2011-01-24 15:01:02 -08:00
Gilles Debunne
14bb8a58c5 am 88b5953a: Merge "NULL inputType text fields should never show the IME." into honeycomb 
* commit '88b5953ab2f63ed6f820bb13845cf8fecb2d57e3':
  NULL inputType text fields should never show the IME.
 2011-01-24 14:48:28 -08:00
Gilles Debunne
caafe33dfe 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
8d24f48727 Merge "NULL inputType text fields should never show the IME." into honeycomb 2011-01-24 14:46:57 -08:00
Gilles Debunne
62bd287d7d Merge "Non-editable TextViews should not display a cursor." into honeycomb 2011-01-24 14:46:42 -08:00
Adam Powell
cd3eea54ba 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
b2859765e8 Merge "Fix bug 3382994 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-24 14:35:11 -08:00
Dianne Hackborn
e3daf45cbb 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
8c00b22fdd 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
66304eadd8 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
27f4479ef1 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
43bc28682d 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
7ffec41c72 Merge "Merge commit '446aea40' into manualmerge" into honeycomb-plus-aosp 2011-01-24 14:32:13 -08:00
Jeff Hamilton
ac655f8d12 Merge commit '446aea40' into manualmerge 
Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
 2011-01-24 16:31:38 -06:00
Xavier Ducrohet
02c8c923c1 Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb 2011-01-24 14:31:28 -08:00
Adam Powell
9ba79184c3 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
8ec254230e 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
Andreas Huber
9d86dd3d47 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
f22700aad0 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
3735bd182d 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
fb2c634139 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-24 13:46:28 -08:00
Andreas Huber
523558ac43 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
622ed4bf67 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
b3cb7d06bd 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
ac74723924 Merge "A few small cleanning-ups." into honeycomb 2011-01-24 13:25:17 -08:00
Dianne Hackborn
64cc3a11e1 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
3dabff9c1f 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
fb85e51e1c Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 2011-01-24 13:14:35 -08:00