Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,957 Commits 3 Branches 0 Tags
c1f63ddba76717db4f42ec04a06a0be12f22b2dc
Commit Graph

22057 Commits

Author SHA1 Message Date
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
Tadashi G. Takaoka
6d1b8995a6 am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE) 
* commit '69a487763812d2c0fb3c9900b12862997bc77f4d':
  Fix input type judgment of WebTextView (DO NOT MERGE)
 2011-05-31 00:23:25 -07:00
Tadashi G. Takaoka
69a4877638 am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE) 
* commit '8ede62745faa02265f927941d1195b6c1bf05ebb':
  Fix input type judgment of WebTextView (DO NOT MERGE)
 2011-05-31 00:18:54 -07:00
Tadashi G. Takaoka
8ede62745f Fix input type judgment of WebTextView (DO NOT MERGE) 
Bug: 4490948
Change-Id: I232b8f1301128f1c77d72d92777a45c63f215a9c
 2011-05-31 11:24:23 +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
Adam Powell
39a8dc4aaf Fix bug 4499292 - ActionBar tabs don't show the first time 
Fix an order of operations issue with actionbar tab initialization.

Change-Id: Ie1b1c76614eafc68e0069985b93683b44699b958
 2011-05-27 18:44:00 -07: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
Dianne Hackborn
9b94aa18f7 am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps. 
* commit 'e5d377014b04022a04fd0b2b24b343d1e0ec8d2a':
  Fix compat mode bugs when updating apps.
 2011-05-27 17:01:47 -07:00
Dianne Hackborn
e5d377014b am 8ea5e1d7: Fix compat mode bugs when updating apps. 
* commit '8ea5e1d79eb1f05ee7628b0d45ea8fc8eea5330d':
  Fix compat mode bugs when updating apps.
 2011-05-27 16:58:33 -07:00
Dianne Hackborn
8ea5e1d79e Fix compat mode bugs when updating apps. 
No longer accidentally puts an app into compatibility mode.

Also various cleanup, freezing screen while switching between modes.

Change-Id: Ic1b3958be7800189a93f68e9dee3c5adfc45fe57
 2011-05-27 16:49:29 -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
Amith Yamasani
068d73cf51 Keep track of USER_QUERY to pass to the intent. 
Fixes bug: 3144023

Change-Id: Ib1f04119c7c0b5aa8ceaf7b15ccec70c76b2dff1
 2011-05-27 15:53:36 -07:00
Fabrice Di Meglio
6e10b08ba9 Merge "Fix overrides of isLayoutRtl(Drawable dr)" 2011-05-27 15:35:12 -07:00
Adam Powell
3526556135 Fix bug 4399686 - missing menu after returning from fullscreen video 
playback in browser

Change-Id: I992c6b1b4db738f937646e0dcac1c83fa5ab4e35
 2011-05-27 15:29:41 -07:00
Fabrice Di Meglio
a98eef8601 Fix overrides of isLayoutRtl(Drawable dr) 
Change-Id: I7042805747db134d93e39cbb41773d8d5a1cb370
 2011-05-27 14:54:59 -07:00
Dianne Hackborn
54cb63e26e am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens. 
* commit '528c49f112dce5f9687f30a9751e783196eca0c6':
  Add "tv" density for 720p screens.
 2011-05-27 14:27:46 -07:00
Dianne Hackborn
528c49f112 am b96cbbd1: Add "tv" density for 720p screens. 
* commit 'b96cbbd11c4590bec846212c33361e02293f18b5':
  Add "tv" density for 720p screens.
 2011-05-27 14:23:11 -07:00
Jaikumar Ganesh
c841001750 am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 
* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
  Remove discoverable timeout handler. DO NOT MERGE
 2011-05-27 13:46:50 -07:00
Adam Powell
098f5bd427 Merge "Action bar tab layout tweaks." 2011-05-27 13:44:33 -07:00
Dianne Hackborn
b96cbbd11c Add "tv" density for 720p screens. 
Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
 2011-05-27 13:40:26 -07:00
Adam Powell
d21aa12e8e Action bar tab layout tweaks. 
Let tabs consume the full action bar when the menu is empty and other
elements are disabled when the tab bar would normally split onto a
second row..

Fix bug 4489724 - bug in ActionBarImpl#cleanupTabs.

Change-Id: I28a235d339137add0b106c6e733a6767fa547810
 2011-05-27 13:12:53 -07:00
Jaikumar Ganesh
e984291f8f Remove discoverable timeout handler. DO NOT MERGE 
This is leftover code from bluez3 days. We get a property change
in Bluez4 and an intent is sent.

Change-Id: I94c57cdebe4a990846a0733a9a71cabc820419e4
 2011-05-27 13:06:45 -07:00
Dianne Hackborn
da9837fb61 am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2 
* commit 'c058d38602a1ffe00e14b4ab32c876c252eabe6d':
  Small fixes and cleanup of resource config handling.
 2011-05-27 12:47:59 -07:00
Dianne Hackborn
c058d38602 am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2 
* commit 'ff7622992f39d8e401ab23c5ce6a84f318906e52':
  Small fixes and cleanup of resource config handling.
 2011-05-27 12:42:56 -07:00
Dianne Hackborn
ff7622992f Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2 2011-05-27 12:40:39 -07:00
Dianne Hackborn
3904d03dd0 Small fixes and cleanup of resource config handling. 
Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
 2011-05-27 12:09:11 -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
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
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