22284 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
ccb2bc6c15 am e0a82fcc: am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit 'e0a82fcc6058e6297d11a040aae13e37a2439c14':
  Fix InputType determination of WebTextView (DO NOT MERGE)
2011-05-27 10:55:23 -07:00
Martijn Coenen
0a266a186d Merge "Fix NdefRecord flags handling." 2011-05-27 10:55:13 -07:00
Tadashi G. Takaoka
e0a82fcc60 am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit '241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
  Fix InputType determination of WebTextView (DO NOT MERGE)
2011-05-27 10:48:52 -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
f7145d5d66 Fix InputType determination of WebTextView (DO NOT MERGE)
The InpuType from <input type="email" /> has been broken.

Change-Id: Ie37de69682410cdd58c29910d483e924f5b614b6
Related-Bug: 4490948
Cherry-pick: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
2011-05-28 01:56:25 +09: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
Ben Murdoch
bf4659605c Merge WebKit at r80534: Update user agent string.
Change-Id: I86a25c2370e1f658f83607f9fe30356bcb916b36
2011-05-27 12:31:19 +01: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
Adam Powell
aa4fa2c5b7 Merge "Sync holo button bar styles with UX." 2011-05-26 18:56:08 -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
Adam Powell
15a7b814e9 Sync holo button bar styles with UX.
Change-Id: I9588f1beb014262bf71d97521b0f371c85977923
2011-05-26 18:40:52 -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
Matthew Xie
a860764402 Merge "Add wide band speech feature flag" 2011-05-26 18:13:08 -07:00
Dianne Hackborn
5c2e4d20df am 8fcbfb52: am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
* commit '8fcbfb52607263754b6d3895a112f792c5c3a12e':
  Add new supports-screens attributes for declaring the compatible screens.
2011-05-26 17:12:36 -07:00
Dianne Hackborn
8fcbfb5260 am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
* commit '94250ac69c6e07534e4781d3479dccb79d8c366c':
  Add new supports-screens attributes for declaring the compatible screens.
2011-05-26 17:09:39 -07:00
Dianne Hackborn
94250ac69c Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 2011-05-26 17:07:52 -07:00
Gilles Debunne
ca6c3a2bba am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
* commit '4ce6822bc63665ca3e9d9984766f367ce4f4d3a7':
  ExternalStorageFormatter takes an optional StorageVolume target.
2011-05-26 15:50:13 -07:00
Adam Powell
73d0a60628 Merge "Fix bug 4487948 - action bar tabs + configuration change = :(" 2011-05-26 15:47:21 -07:00
Gilles Debunne
4ce6822bc6 am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
* commit '24de44a1877be3e5d63697f90c98a87a4d88b1fb':
  ExternalStorageFormatter takes an optional StorageVolume target.
2011-05-26 15:47:14 -07:00
Adam Powell
25151e4792 Fix bug 4487948 - action bar tabs + configuration change = :(
Change-Id: If7f622865ae5597cd9fb664a2952481da5c7e09a
2011-05-26 15:44:59 -07:00
Gilles Debunne
24de44a187 Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2 2011-05-26 15:44:18 -07:00
Eric Fischer
a524dbd4a9 Merge "Import revised translations." 2011-05-26 15:37:27 -07:00
Eric Fischer
8447a13f9c Import revised translations.
Change-Id: I10a93a6f3a274354e88263d86a8855d1e7121f58
2011-05-26 15:34:01 -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
Matthew Xie
c3b8491868 Add wide band speech feature flag
Add a boolean flag resource to indicate if current platform supports
bluetooth wide band speech.
This is part of Handsfree 1.6 new feature change.
Bug 4449070

Change-Id: Iee5e969d030108382dd2fa6568ce3d80c6b611d6
2011-05-26 15:17:10 -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
df6e980e3f Add new supports-screens attributes for declaring the compatible screens.
Change-Id: I40d57e4354e48accc1027c9f90916ea73eb5190d
android:requiresSmallestWidthDp provides the smallest supported width.
android:compatibleWidthLimitDp provides the largest compatible width.
2011-05-26 14:48:04 -07:00
Adam Powell
d31320d58f am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '47dae694d7476e8a3de1e9b487b89e003b8440b1':
  DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
2011-05-26 14:14:50 -07:00
Scott Main
dcf305ebf9 am 101139cc: am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
* commit '101139cc8f5b975dfacf1a2ffd3bdae8e3907f65':
  DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
2011-05-26 14:14:45 -07:00
Dianne Hackborn
76450622f0 am d5238cc1: am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit 'd5238cc1ab8366389b2aada228f2f2e5cbb3244e':
  Rework how we decide whether to use system or status bar.
2011-05-26 14:14:35 -07:00
Eric Fischer
0bb63c58a4 am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '90856661cf07453a23c3737f421a4686b70d95c1':
  Import revised translations.  DO NOT MERGE
2011-05-26 14:14:31 -07:00
Adam Powell
47dae694d7 am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '7eba403e9a64f7153b7e5788902d4f799739158e':
  DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
2011-05-26 13:34:45 -07:00
Kenny Root
5e34a1945a am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
* commit '1d8f8819f1e98cdf3b7756396158613e95fe9eb6':
  Break apart queries to getInstalled* API DO NOT MERGE
2011-05-26 13:34:42 -07:00
Scott Main
101139cc8f am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
* commit 'c31239616cca417e71acb98813df7eda645835df':
  DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
2011-05-26 13:34:40 -07:00
Dianne Hackborn
d5238cc1ab am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit '7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
  Rework how we decide whether to use system or status bar.
2011-05-26 13:34:33 -07:00
Eric Fischer
90856661cf am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '66fd9ab236b3df85a32792caec41a2cd83622e28':
  Import revised translations.  DO NOT MERGE
2011-05-26 13:34:29 -07:00
Adam Powell
7eba403e9a Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2 2011-05-26 13:26:33 -07:00
Adam Powell
dc61f26701 DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones
in smaller-screen decor layouts.

Keep the internal id declared to keep code in sync with downstream
branches.

Change-Id: I25d2ff7c40c220ecc93b195dfd4e953fe0b4d944
2011-05-26 13:24:08 -07:00
Kenny Root
1d8f8819f1 Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2 2011-05-26 13:10:23 -07:00
Scott Main
c31239616c DO NOT MERGE
cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662
docs: add accepted values for setting status bar visibility

Change-Id: I255dcd62b71c1b4ca40187b395abce8d6836c249
2011-05-26 12:44:08 -07:00
Gilles Debunne
37051cdd86 ExternalStorageFormatter takes an optional StorageVolume target.
Change-Id: Ic85689659dbf49a7fcc1b7aaf25e4a94e62848b9
2011-05-26 11:45:17 -07:00
Dianne Hackborn
7a09f72b88 Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 2011-05-26 11:39:22 -07:00
Eric Fischer
66fd9ab236 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:36:58 -07:00
Eric Fischer
4f6adc5dbf Import revised translations. DO NOT MERGE
Change-Id: I596d69bead9553185fd835c79123f354a06b3d5b
2011-05-26 11:23:32 -07:00