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

16434 Commits

Author SHA1 Message Date
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
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
Scott Main
3453b1c584 Merge "docs: add accepted values for setting status bar visibility" 2011-05-26 10:29:45 -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
Mike Lockwood
af4932a2be Merge "Environment: Fix default mount point for external storage" 2011-05-25 20:36:05 -07:00
Dianne Hackborn
b2771f1a41 Merge "resolved conflicts for merge of 77dd616e to master" 2011-05-25 20:35:04 -07:00
Mike Lockwood
d4bdc7b4da Environment: Fix default mount point for external storage 
/mnt/sdcard is the real mount point.  /sdcard is just a symlink.

Change-Id: If584e5cd31238d5b263de5bd72e179d53875d8c3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-25 23:33:50 -04:00
satok
f9f0100862 Add Apis to send notifications when the suggestion was picked 
- Due to a strong request from VoiceIME

Bug: 4443922

Change-Id: Ia539de0acf66053e0349daec459d75e36805f6bf
 2011-05-26 11:02:31 +09:00
Dianne Hackborn
fee1c69a49 resolved conflicts for merge of 77dd616e to master 
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
 2011-05-25 16:36:50 -07:00
Kristian Monsen
1fae3cf246 Merge "Merge Chromium at 10.0.634.0: Add autofill fax string" 2011-05-25 12:09:46 -07:00
Adam Powell
50f7fb9ca1 Merge "Action bar tab layout" 2011-05-25 12:01:00 -07:00
Adam Powell
f8ac6b7394 Action bar tab layout 
Sync with UX on action bar tab layout behavior.

Make action bar tabs behave better with configuration changes.

LinearLayout now supports largest child measurement in unspecified
mode.

Change-Id: Id520641715a61c07e64124a0c5a70912996c98a0
 2011-05-25 11:55:56 -07:00
Joe Onorato
cfb046dead am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '2c09a9c0e960163a16ad1d06055aa6ee9635c693':
  Make adb shell am display-size persistent.
 2011-05-25 11:46:28 -07:00
Joe Onorato
2c09a9c0e9 am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
  Make adb shell am display-size persistent.
 2011-05-25 11:43:06 -07:00
Joe Onorato
5520610cb2 Merge "Make adb shell am display-size persistent." into honeycomb-mr2 2011-05-25 11:40:59 -07:00
Joe Onorato
571ae90801 Make adb shell am display-size persistent. 
Change-Id: If3d5d18729f4e89eb7e689994deadd996fd487e9
 2011-05-25 11:40:21 -07:00
Romain Guy
4725a90e8e Code cleanup. 
Change-Id: Ie7685b14e3eb81a2e1034004c3ba04b523e9dd13
 2011-05-25 11:13:20 -07:00
Romain Guy
7d70fbf0b5 Use OpenGL to render transition bitmaps. 
When the IME is opened/dismissed, ViewAncestor would draw the
view hierarchy into a Bitmap, using the software rendering
pipeline. With this change, ViewAncestor will now use OpenGL.

Change-Id: I69e24570e12ff55f6f3cec18a664b33410a0eaf4
 2011-05-25 11:13:19 -07:00
Amith Yamasani
361c286d09 am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '5d9e0a1a867aa5b6162a972288cbef41fd68a29b':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 11:08:30 -07:00
Russell Brenner
0d74112eed Merge "merge from honeycomb mr2" 2011-05-25 11:04:28 -07:00
Amith Yamasani
5d9e0a1a86 am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '99a8e1d2931f4deb35c54f144de26fc6124de5fc':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 11:02:01 -07:00
Amith Yamasani
99a8e1d293 Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 2011-05-25 10:58:24 -07:00
Kristian Monsen
a014db7f0b Merge Chromium at 10.0.634.0: Add autofill fax string 
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710

Change-Id: I20130029e26f2d9ef6ea4828921b070c887ccb69
 2011-05-25 18:54:31 +01:00
Russell Brenner
70ecf97804 merge from honeycomb mr2 
Refire the redraw event if webkit wasn't ready

If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: I70fcf652cc854f995885c58b55d58ecf75734ab8
 2011-05-25 10:23:26 -07:00