Adam Cohen
49d3e93f13
am 65eea842: am a049fe95: Merge "Fixing a couple StackView bugs:" into honeycomb
...
* commit '65eea842aff04f3949006315ffef5e7228f98051':
Fixing a couple StackView bugs:
2011-01-21 18:16:23 -08:00
Adam Cohen
65eea842af
am a049fe95: Merge "Fixing a couple StackView bugs:" into honeycomb
...
* commit 'a049fe95cdf68c73f104420433610d8a8a8a7357':
Fixing a couple StackView bugs:
2011-01-21 18:14:00 -08:00
Adam Cohen
a049fe95cd
Merge "Fixing a couple StackView bugs:" into honeycomb
2011-01-21 18:12:15 -08:00
Adam Cohen
e86ff4d561
Fixing a couple StackView bugs:
...
-> Making sure to update visuals every time adapter count changes
-> Fixing a clipping issue seen on some devices
Change-Id: I489395b5caaa06eb7187b2dac679b793bf54d7e1
2011-01-21 17:59:29 -08:00
Dianne Hackborn
d9e1b56689
am 3da75ab9: am 3a56ce3a: Merge "Fix some error messages, turn off logging." into honeycomb
...
* commit '3da75ab90c4e6309ec6d6801bf0208cff6249b2d':
Fix some error messages, turn off logging.
2011-01-21 16:49:22 -08:00
Dianne Hackborn
3da75ab90c
am 3a56ce3a: Merge "Fix some error messages, turn off logging." into honeycomb
...
* commit '3a56ce3ab30a72c359bf64cf75bdce6ab03f2b7a':
Fix some error messages, turn off logging.
2011-01-21 16:46:35 -08:00
Dianne Hackborn
3a56ce3ab3
Merge "Fix some error messages, turn off logging." into honeycomb
2011-01-21 16:45:27 -08:00
Dianne Hackborn
ec541e1787
Fix some error messages, turn off logging.
...
Change-Id: Ifcd2c0f0ad137485896144d2248361aeb0a05600
2011-01-21 16:44:04 -08:00
Fabrice Di Meglio
2dc8722862
am b686ee12: am 9e2fa7a5: Merge "Fix bug #3338957 (Account Picker and Account type picker need love)" into honeycomb
...
* commit 'b686ee122d3367318782222298af2ac4daf0a813':
Fix bug #3338957 (Account Picker and Account type picker need love)
2011-01-21 16:23:36 -08:00
Fabrice Di Meglio
b686ee122d
am 9e2fa7a5: Merge "Fix bug #3338957 (Account Picker and Account type picker need love)" into honeycomb
...
* commit '9e2fa7a5b6a91bae3897e921d8c21557c2feb714':
Fix bug #3338957 (Account Picker and Account type picker need love)
2011-01-21 16:22:01 -08:00
Fabrice Di Meglio
9e2fa7a5b6
Merge "Fix bug #3338957 (Account Picker and Account type picker need love)" into honeycomb
2011-01-21 16:20:37 -08:00
Nick Pelly
a53086c088
am 5cfbda15: resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
...
* commit '5cfbda15425d078224405950c4be92471279f917':
Change signature of MifareClassic.authenticate*() to throw IOException.
2011-01-21 16:05:47 -08:00
Adam Powell
61d4504ec6
am a4f8e903: am 5fc3c84f: Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb
...
* commit 'a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1':
Fix bug 3362680 - calendar crash while tabbing among views
2011-01-21 15:56:08 -08:00
Nick Pelly
405a32ac23
am c971d5ed: am 82160444: am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
...
* commit 'c971d5ed8e2c8674152f9292a890558535a7268a':
Support for TagLostException (API).
2011-01-21 15:53:43 -08:00
Nick Pelly
3965ebbb03
am 274ee68d: am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit '274ee68d32237d95f05c269c250146d9b3202fbc':
Fix javadoc which broke build.
2011-01-21 15:53:31 -08:00
Adam Powell
a4f8e903c3
am 5fc3c84f: Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb
...
* commit '5fc3c84f5c465d3f0f435037bd5b92fa8da1f2c2':
Fix bug 3362680 - calendar crash while tabbing among views
2011-01-21 15:52:12 -08:00
Nick Pelly
c971d5ed8e
am 82160444: am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
...
* commit '8216044435d066a6279d1a733b919156bdc9325f':
Support for TagLostException (API).
2011-01-21 15:50:54 -08:00
Nick Pelly
274ee68d32
am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit 'ccc9a9e58247d174d587dee465868a948a07364f':
Fix javadoc which broke build.
2011-01-21 15:50:20 -08:00
Adam Powell
5fc3c84f5c
Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb
2011-01-21 15:49:46 -08:00
Jaikumar Ganesh
6632362a8a
am 32064b67: am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
...
* commit '32064b6727127e275be23eb2eed18eabe84ee3b2':
Temporary Changes for certification of SCO.
2011-01-21 15:47:59 -08:00
Jaikumar Ganesh
32064b6727
am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
...
* commit 'c4cc3ea48add3b7a63a1a97fc3a4c89b24217604':
Temporary Changes for certification of SCO.
2011-01-21 15:45:54 -08:00
Jaikumar Ganesh
c4cc3ea48a
Merge "Temporary Changes for certification of SCO." into honeycomb
2011-01-21 15:43:42 -08:00
Adam Powell
3cb8b638c4
Fix bug 3362680 - calendar crash while tabbing among views
...
Remove pending click callbacks when a view is detached from its
window.
Change-Id: I51de184b8e95dbd594675ea6849647586a7c4ba2
2011-01-21 15:34:14 -08:00
Nick Pelly
8dd7a54136
am a4f26c3d: am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit 'a4f26c3d034885f1d9063f484f44e8c78c8495eb':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-21 15:34:00 -08:00
Mathias Agopian
3ca816c132
am 80f3376b: am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit '80f3376b3a0f9c677c37c98382d1021bed6c5633':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-21 15:33:56 -08:00
Gilles Debunne
9543e3e12b
am 48617a51: am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
...
* commit '48617a51346af3463e10a7236fe5043787ed5db4':
Tapping inside an EditText should always pop up the IME.
2011-01-21 15:33:22 -08:00
Nick Pelly
5cfbda1542
resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
...
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
2011-01-21 15:30:32 -08:00
Jaikumar Ganesh
75c2701454
Temporary Changes for certification of SCO.
...
Bug: 3349475
Change-Id: I555b127a1d9218494cd05c07c9e9f29628f3bc74
2011-01-21 15:17:23 -08:00
Nick Pelly
a4f26c3d03
am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit '4d3ac03ade6184504ad3881def5e86133ae5f2f6':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-21 15:03:19 -08:00
Mathias Agopian
80f3376b3a
am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit 'b92a40ebfaf49783f942b75b413e1499e149c3bb':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-21 15:02:26 -08:00
Fabrice Di Meglio
795f135a08
Fix bug #3338957 (Account Picker and Account type picker need love)
...
- update UI to match design requirements
Change-Id: Idb5dbea876eb7170a8c1f077a99cfe168d41f1e1
2011-01-21 14:58:02 -08:00
Gilles Debunne
48617a5134
am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
...
* commit 'b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
Tapping inside an EditText should always pop up the IME.
2011-01-21 14:55:50 -08:00
Gilles Debunne
b5e5b2d99b
Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
2011-01-21 14:53:44 -08:00
Amith Yamasani
54468ba12e
am 610dff54: am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
...
* commit '610dff54fc6f350e1f7976027bb69a813fa055af':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
2011-01-21 14:51:34 -08:00
Michael Kolb
caed391640
am b2b83077: am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
...
* commit 'b2b830774f4aff0bacf30648a4f7efce49e403fd':
Add public API for on screen zoom controls
2011-01-21 14:51:26 -08:00
Amith Yamasani
610dff54fc
am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
...
* commit 'b58b5db4ba8edc075f6524df200aa8d3c678e267':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
2011-01-21 14:49:34 -08:00
Michael Kolb
b2b830774f
am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
...
* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
Add public API for on screen zoom controls
2011-01-21 14:49:30 -08:00
Amith Yamasani
b58b5db4ba
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
2011-01-21 14:47:32 -08:00
Michael Kolb
debb5bbe81
Merge "Add public API for on screen zoom controls" into honeycomb
2011-01-21 14:47:30 -08:00
Brad Fitzpatrick
b8febbe12e
am 8a82de2f: am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
...
* commit '8a82de2fcae11a2a9cba25132c37cad83ccc859f':
frameworks/base: remove redundant code in WindowManager
2011-01-21 14:40:35 -08:00
Martijn Coenen
8c3713b058
am ed0c705f: am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().
...
* commit 'ed0c705f3e5879d20c6e6f0ae45529755f8636e0':
Check NDEF before calling makeReadOnly().
2011-01-21 14:40:30 -08:00
Brad Fitzpatrick
8a82de2fca
am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
...
* commit '4bb180d62f71658d04a7d6800707de83c10b01a5':
frameworks/base: remove redundant code in WindowManager
2011-01-21 14:36:43 -08:00
Martijn Coenen
ed0c705f3e
am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().
...
* commit 'c4eee776ad9d3de99032984fe20f5de395888bc7':
Check NDEF before calling makeReadOnly().
2011-01-21 14:36:33 -08:00
Nick Pelly
3a3ae4e593
am ed8bb922: Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'ed8bb922c22cb2b409318e3b777fdd892111bc4f':
Implement IsoDep timeout handling (API).
2011-01-21 14:36:06 -08:00
Leon Scroggins
d022c697c2
am 12871245: am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb
...
* commit '12871245c7920df992341fa095dc83df94ee763c':
Restart input when the webpage changes the text.
2011-01-21 14:35:58 -08:00
Nick Pelly
ed8bb922c2
Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-21 14:34:03 -08:00
Leon Scroggins
12871245c7
am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb
...
* commit '6013013829d1f97970d3ed426006d2522303826f':
Restart input when the webpage changes the text.
2011-01-21 14:33:03 -08:00
Leon Scroggins
6013013829
Merge "Restart input when the webpage changes the text." into honeycomb
2011-01-21 14:30:50 -08:00
Michael Kolb
5840cd294a
Add public API for on screen zoom controls
...
http://b/issue?id=3378224
This is a simple unhide.
Allow the use of WebView pinch-to-zoom gestures
without the on screen zoom controls.
Currently, enabling pinch to zoom with the public API also shows the
on screen zoom buttons.
If the zoom buttons are not wanted, a custom implementation of pinch to
zoom is required, which can't be done correctly at this point.
Change-Id: I3f94080471c3a4b498b11c91603fff9994dc3c2c
2011-01-21 14:15:16 -08:00
Leon Scroggins
a51063c059
Restart input when the webpage changes the text.
...
Bug:3375518
Change-Id: I0a18d0ca764ce428d86bd5f6d13f8764668acea6
2011-01-21 17:14:36 -05:00