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

42643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
aaa55d3f45 Merge "New orientation listener." into honeycomb 2011-01-24 15:31:22 -08:00
Svetoslav Ganov
f6e7d59222 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
33322052ed Merge "DatePicker is picking the wrong date" into honeycomb 2011-01-24 15:26:42 -08:00
Mike Lockwood
a6b1cd5acf Merge "libutils: Fix race condition in Thread::requestExitAndWait()" 2011-01-24 15:26:31 -08:00
Mike Lockwood
4a7f412e1d libutils: Fix race condition in Thread::requestExitAndWait() 
Hold a reference to the thread in requestExitAndWait() so the
condition variable it is waiting on will not be destroyed before
its wait() call returns.

Change-Id: If8b6cf84117203926a4180f43f0224469e92a500
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-24 15:25:38 -08:00
Jim Miller
e4c2d806a8 Fix 3382123: Set default state of LockScreen portrait kb 
This sets the default state of the portrait keyboard to
"gone" to agree with the landscape keyboard.

Change-Id: I1e6a21b07c27ef739bfde4558b958c48b4fc56df
 2011-01-24 15:24:01 -08:00
Adam Powell
440d23a20d am efc2714d: am 1914971c: Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb 
* commit 'efc2714dea3daa2fce376aecfe6d31d194c39b3d':
  Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible
 2011-01-24 15:08:45 -08:00
Leon Scroggins
62e4af1656 am 09176dcb: am 8801ad35: Merge "Disable focus controller when WebView loses focus." into honeycomb 
* commit '09176dcb3d01b014eeb73ab3d643ac36c717dd75':
  Disable focus controller when WebView loses focus.
 2011-01-24 15:06:30 -08:00
Adam Powell
efc2714dea 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
09176dcb3d 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
1914971c6b 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
Gilles Debunne
ad18453037 am c46491fc: am 7c8c6d68: Typo in InputMethodManager\'s documentation 
* commit 'c46491fc2fdaa8cddaa2a4f83f50630b7d2e2a74':
  Typo in InputMethodManager's documentation
 2011-01-24 15:03:12 -08:00
Leon Scroggins
8801ad3526 Merge "Disable focus controller when WebView loses focus." into honeycomb 2011-01-24 15:02:10 -08:00
Gilles Debunne
c46491fc2f am 7c8c6d68: Typo in InputMethodManager\'s documentation 
* commit '7c8c6d689280ecfbd151a2e0cb40341768470676':
  Typo in InputMethodManager's documentation
 2011-01-24 15:01:02 -08:00
Adam Powell
4ce35419ce Fix bug 3242393 - overscroll effect missing from lists which drag but 
are always visible

Change-Id: I20d73c452c7b98f1a046e356d0c6cdbfc8e5fe7a
 2011-01-24 14:55:00 -08:00
Gilles Debunne
3a23a82275 am 287035f5: am 88b5953a: Merge "NULL inputType text fields should never show the IME." into honeycomb 
* commit '287035f5749e4a5d4f088ee5f215f9ec4d03cc42':
  NULL inputType text fields should never show the IME.
 2011-01-24 14:50:29 -08:00
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
287035f574 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
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
7c8c6d6892 Typo in InputMethodManager's documentation 
Change-Id: I711e6d24462e336546b789fac0b9c6f529ebe260
 2011-01-24 14:48:14 -08:00
Gilles Debunne
88b5953ab2 Merge "NULL inputType text fields should never show the IME." into honeycomb 2011-01-24 14:46:57 -08:00
Gilles Debunne
705a27a97c Merge "Non-editable TextViews should not display a cursor." into honeycomb 2011-01-24 14:46:42 -08:00
Leon Scroggins
b4ffd11284 Disable focus controller when WebView loses focus. 
Bug:3370821
Change-Id: Ia26a54e1c5ec050d76e60762f9a5eb4502d8c6e3
 2011-01-24 17:43:47 -05: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
Brad Fitzpatrick
23a813e17d am 996de2dd: Merge "Avoid using String.format in MediaRecorder" 
* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
  Avoid using String.format in MediaRecorder
 2011-01-24 14:03:48 -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