Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,342 Commits 3 Branches 0 Tags
b59c861db4dfeba6a80f50a3d986300a64689aaf
Commit Graph

18556 Commits

Author SHA1 Message Date
Adam Powell
64a16d99df am 44c3095d: am 532c1455: Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb 
* commit '44c3095d1e20ada175ed4517a27972f87cae71df':
  Fix bug 3383867 - default height for dropdown list items in framework layouts
 2011-01-24 17:29:30 -08:00
Adam Powell
44c3095d1e 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
532c145540 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
f7b6800f90 am 281d36e8: am d2d31dad: Merge "Fix 3381660: Update PasswordUnlock screen\'s EditText background." into honeycomb 
* commit '281d36e8f5b52bcc5fe1ef5dfd849433b4dce940':
  Fix 3381660: Update PasswordUnlock screen's EditText background.
 2011-01-24 17:20:36 -08:00
Jim Miller
281d36e8f5 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
Adam Powell
5df3426a44 Fix bug 3383867 - default height for dropdown list items in framework layouts 
Change-Id: I8a7553c3dc6b8c0eb95445c796c8298d1cdecc01
 2011-01-24 17:15:52 -08:00
Jim Miller
d2d31dadb0 Merge "Fix 3381660: Update PasswordUnlock screen's EditText background." into honeycomb 2011-01-24 17:13:30 -08:00
Chet Haase
63502a7fb2 am 2292fb4a: am 50d4de21: Merge "Fix bug with display lists and layout." into honeycomb 
* commit '2292fb4afb942b5880ef20bca5b255c5e005fa5e':
  Fix bug with display lists and layout.
 2011-01-24 17:08:55 -08:00
Chet Haase
2292fb4afb 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
5e488111f2 am 191f8ff3: am 85d3ef33: Merge "Fix 3381304: disable key preview in LockScreen\'s qwerty keyboard" into honeycomb 
* commit '191f8ff3545b891ec395f700771b79689b58e422':
  Fix 3381304: disable key preview in LockScreen's qwerty keyboard
 2011-01-24 17:06:44 -08:00
Jim Miller
191f8ff354 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
50d4de21ee Merge "Fix bug with display lists and layout." into honeycomb 2011-01-24 17:03:30 -08:00
Jim Miller
85d3ef337b Merge "Fix 3381304: disable key preview in LockScreen's qwerty keyboard" into honeycomb 2011-01-24 17:03:07 -08:00
Chet Haase
5af048c791 Fix bug with display lists and layout. 
requestLayout() and forceLayout() should force the INVALIDATED
flag to be set, which causes a view's display list to be regenerated
on the next drawing operation. This is necessary when containers change
due to layout requests.

Change-Id: I5b18b5936b59f0605f93c8f45baf83a76dab4e5e
 2011-01-24 17:00:32 -08:00
Jeff Brown
76a23f8b2e resolved conflicts for merge of eebc944f to master 
Change-Id: I969cf69d2bd6901742d2cdf1bd44344ee7ba9fc7
 2011-01-24 16:43:28 -08:00
Svetoslav Ganov
9bb7bf6327 am f6e7d592: am 33322052: Merge "DatePicker is picking the wrong date" into honeycomb 
* commit 'f6e7d592224851b7d623180bb2ea780234580cee':
  DatePicker is picking the wrong date
 2011-01-24 16:24:32 -08:00
Jim Miller
e57c0bd4c6 Fix 3381660: Update PasswordUnlock screen's EditText background. 
This updates the assets for the password field to use a lighter
background.  It also moves them into the proper location for xlarge
device.

Change-Id: Iab084a067589d730a7138188be79543e9fb57168
 2011-01-24 16:20:29 -08:00
Jeff Brown
eebc944fd1 am aaa55d3f: Merge "New orientation listener." into honeycomb 
* commit 'aaa55d3f45744814907d0809befb49281ced462e':
  New orientation listener.
 2011-01-24 15:33:46 -08:00
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
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
Adam Powell
c831e3192c Merge "Fix bug 3382994 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-24 14:35:11 -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
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
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
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
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