Gilles Debunne
aa67eef1b6
Remove suggestion span underline on device rotation
...
Change-Id: I2fca995f839eff84ee8c62289f6f110ebb8dd321
2011-06-01 18:03:37 -07:00
Gilles Debunne
829de65b9a
Merge "Select all for text shown as an icon on smaller screens"
2011-06-01 10:13:42 -07:00
Dianne Hackborn
4d710ad53e
Merge "resolved conflicts for merge of 590ec479 to master"
2011-05-31 23:34:46 -07:00
Dianne Hackborn
36f80f3a5a
resolved conflicts for merge of 590ec479 to master
...
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
2011-05-31 23:11:16 -07:00
Matthew Xie
646590ef0a
Merge "Add public api BluetoothSocket.isConnected."
2011-05-31 18:04:36 -07:00
Gilles Debunne
5e9af2ddf0
Select all for text shown as an icon on smaller screens
...
Text has been removed to leave space for 4 icons, that should fit
even in portrait mode.
Note: requires a definitive selectAll icon from designers.
Change-Id: I65547527e9ca872aa8888467f31fa7de9653fa77
2011-05-31 17:05:33 -07:00
Fabrice Di Meglio
38fd7cde0b
Merge "Fix TextView potential NPE in isLayoutRtl()"
2011-05-31 16:57:55 -07:00
RoboErik
85284fbca7
Merge "Work on changing syncx to cal_syncx"
2011-05-31 16:44:04 -07:00
Fabrice Di Meglio
83fa41b06e
Fix TextView potential NPE in isLayoutRtl()
...
- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)
Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
2011-05-31 16:35:18 -07:00
Mike Lockwood
b0aee3ee43
Merge "Move stringToFile utility from ConnectivityService to FileUtils"
2011-05-31 16:14:08 -07:00
Jeff Hamilton
e00ef00873
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
...
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
Swap Mifare for MIFARE.
2011-05-31 16:00:46 -07:00
RoboErik
be01039a7f
Work on changing syncx to cal_syncx
...
Change-Id: I756ff09c43f39ad52a8793011d3192d59eb574eb
2011-05-31 13:25:10 -07:00
Joe Onorato
e36364ce0f
Merge "Reduce log spew."
2011-05-31 12:44:13 -07:00
Svetoslav Ganov
b1af3a2d1f
Merge "Accessibility serviceconfiguration via meta-data"
2011-05-31 12:05:54 -07:00
Svetoslav Ganov
cc4053e031
Accessibility serviceconfiguration via meta-data
...
Note: This is a part of two CL change and contains the
system changes without updates to the settings.
1. Added a mechanism for configuring an accessibility service via
XML file specified in a meta-data tag (similar to IMEs).
2. Added property for specifying a settings activity for an
accessibility service.
3. Refactored the APIs in AccessibilityManager to return
lists of AccessiblityServiceInfo instead ServiceInfo
since the former describes an AccessibilityService in
particular (similar to IMEs).
Change-Id: Ie8781bb7e0cdb329e583b6702a612a507367ad7b
2011-05-31 12:04:18 -07:00
Fabrice Di Meglio
798a3fe167
Merge "Fix default for getAbsoluteGravity()"
2011-05-31 11:56:59 -07:00
Gilles Debunne
da188fbe4b
Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews"
2011-05-31 10:41:58 -07:00
Martijn Coenen
fe6dfd504b
Implement Mifare Ultralight-C detection (API).
...
Bug: 3398465
Change-Id: Ieb60deedfde5af4494a14b3e322c5a61ae75aaf9
2011-05-31 10:30:56 -07:00
Kristian Monsen
2032eee0c1
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy
...
This is the WebView part, passing the bypass list to
the native side.
Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.
Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,112401
Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111832
Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
2011-05-31 14:54:51 +01:00
Tadashi G. Takaoka
d555e5dccc
Fix input type judgment of WebTextView
...
Bug: 4490948
Cherry-pick: I232b8f13
Change-Id: I09a7e829edd7ca8d54fa109dc14b4a3946de0f1b
2011-05-31 16:27:28 +09:00
Mike Lockwood
da8bb74b9d
Move stringToFile utility from ConnectivityService to FileUtils
...
Change-Id: I59a2dc649d59677f6b5e7ade252587c7c151ec06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-28 13:28:12 -04:00
Fabrice Di Meglio
c05aace48a
Fix default for getAbsoluteGravity()
...
- remove LEFT as default, keep it as it is given (because apply() is doing CENTER_HORIZONTAL)
- update unit tests
Change-Id: I294621c5d5c7d675a715c15cb10947d026539b21
2011-05-27 17:52:37 -07:00
Svetoslav Ganov
ed9a34d54b
Merge "Refatoring a bit of accessibility code"
2011-05-27 16:40:17 -07:00
Svetoslav Ganov
bad9d97693
Refatoring a bit of accessibility code
...
Change-Id: I4df1741b622b21176c10311da0dc6347ca6fb390
2011-05-27 16:39:18 -07:00
Gilles Debunne
e8e833fbe8
Merge "Replacement spans correctly measured in TextView"
2011-05-27 16:12:19 -07:00
Gilles Debunne
d4bb0b01c6
Fix for bug 4499752 - Detect nulled layouts in HandleViews
...
Change-Id: I6a7289150bf461cdf4cca0aff4aa4a0400e0d553
2011-05-27 16:02:40 -07:00
Fabrice Di Meglio
a98eef8601
Fix overrides of isLayoutRtl(Drawable dr)
...
Change-Id: I7042805747db134d93e39cbb41773d8d5a1cb370
2011-05-27 14:54:59 -07:00
Fabrice Di Meglio
5ff0f99b23
Merge "Add support for Gravity BEFORE and AFTER"
2011-05-27 11:28:43 -07:00
Fabrice Di Meglio
6a03640539
Add support for Gravity BEFORE and AFTER
...
- update layouts
- add Callback2 for RTL aware Drawable
- add unit tests
Change-Id: Ic64d0291e262170aff7297c6580b0b422eaa8d89
2011-05-27 11:23:15 -07:00
Martijn Coenen
0a266a186d
Merge "Fix NdefRecord flags handling."
2011-05-27 10:55:13 -07:00
Amith Yamasani
a4fa2cd1c0
Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones."
2011-05-27 10:24:59 -07:00
Brian Carlstrom
4fdf396219
Merge "Tracking merge of dalvik-dev to master"
2011-05-27 10:12:34 -07:00
Tadashi G. Takaoka
93bfbc0fc3
Merge "Fix InputType determination of WebTextView"
2011-05-27 09:54:02 -07:00
Gilles Debunne
9a3a884864
Replacement spans correctly measured in TextView
...
Bug 4444591
Change-Id: I74c94445806d6c00b0971146cac57363c7d3f205
2011-05-27 09:34:09 -07:00
Gilles Debunne
a019ba7995
Merge "EditText notifies the IME when a suggestion is picked."
2011-05-27 09:26:53 -07:00
Martijn Coenen
8bede17047
Fix NdefRecord flags handling.
...
NdefMessages created from byte arrays set the wrong flags on
NdefRecord: every record had at least FLAG_MB|FLAG_ME set, instead of actually
setting the flags from the byte-stream itself. Fixed by creating an internal
constructor which can take the flags.
Public constructor remains the same, as we don't want to bother application
writers with these flags - they can be inferred from the context in which the
record is used. Getting the flags is not a public operation on an NdefRecord
either. However, applications can get the byte[] representation and it
is reasonable for them to expect the flags byte to be set correctly.
Change-Id: Ic32411688dd092c55b1aeccbba9635792e15a671
2011-05-27 08:18:18 -07:00
Tadashi G. Takaoka
2c0a809315
Fix InputType determination of WebTextView
...
The InpuType from <input type="email" /> has been broken.
Related-Bug: 4490948
Change-Id: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
2011-05-27 22:00:07 +09:00
Brian Carlstrom
a7284f0e72
Tracking merge of dalvik-dev to master
...
Adapt to change in the way MockWebServer sets up CONNECT proxies.
git cherry-pick --no-commit c7e2feee5e7908a019a0de91123c1feb9bdc38bc
React to move of Base64 in libcore
git cherry-pick --no-commit 119f7ebdd1f8df3a8ff8e3b8056bff725d569253
Expose and document android.net.HttpResponseCache.
git cherry-pick --no-commit 7b73f0fdb8c032a65c55610541d66385bd8bcbe6)
make update-api
Change-Id: Ieb48b304ea38ee8c2ec01e860d99b1404583889e
2011-05-27 01:21:50 -07:00
Romain Guy
afe68c689f
Merge "Remove extraneous log."
2011-05-26 18:49:30 -07:00
Romain Guy
bc7cdb6783
Remove extraneous log.
...
Change-Id: I91b248410d69836c7a3b56eb0867224ccb4a5336
2011-05-26 18:48:49 -07:00
Gilles Debunne
b1619e5615
EditText notifies the IME when a suggestion is picked.
...
Bug 4443922
Change-Id: Ie1e5a8164bf80bcfb48036c9337e649dc0d8a2fb
2011-05-26 18:28:22 -07:00
Amith Yamasani
405c1af756
Manual merge. Preference activity changes to work on smaller tablet screens and phones.
...
Padding around fragments and to the left of preference items
adjusted for different display sizes.
Change-Id: I2d29e5525c381092a3f1d2fb1265ce07db893d78
2011-05-26 15:20:14 -07:00
Shimeng (Simon) Wang
09cb64bcd1
Fix zoom overview width and postscale for non-wide-viewport mode.
...
issue: 4396010
Change-Id: I90aefac9fdf53834c0774d5c1b37693413798689
2011-05-26 15:09:12 -07:00
Dianne Hackborn
590ec479fd
am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
...
* commit '80ef2a9745e6103efd9698577536bbfed1fd74f6':
Spiffy new compatibility mode UI.
2011-05-26 11:02:52 -07:00
Scott Main
3453b1c584
Merge "docs: add accepted values for setting status bar visibility"
2011-05-26 10:29:45 -07:00
Dianne Hackborn
80ef2a9745
am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
...
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
Spiffy new compatibility mode UI.
2011-05-26 10:00:00 -07:00
Philip Milne
3f8956d82b
Introduction of GridLayout.
...
Change-Id: Ia2ec315e7d29dcc5aa13b080fc6ce00708e9c034
2011-05-26 09:28:26 -07:00
Daniel Sandler
8c1132e3ce
Merge "Framework support for Android Dreams."
2011-05-26 06:01:41 -07:00
satok
42c5a1666c
Fix internal variables and equals in SuggestionSpan
...
Bug: 4443922
- Instantiating other package's class for the name is complicated, so we changed the internal value for the notification target class from Class to String.
- Implement equals
Change-Id: Iaf7682be777f0027d33c9a3be4609ac01b6950ad
2011-05-26 19:21:35 +09:00
Joe Onorato
2a3c67c0e9
am cfb046de: am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit 'cfb046dead49568de6f6808a697e0508ef39a3a6':
Make adb shell am display-size persistent.
2011-05-25 21:29:07 -07:00