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

22284 Commits

Author SHA1 Message Date
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
Adam Powell
60761f4fa5 am 31caa0e6: am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 
* commit '31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
  Updated popup dialog 9 patches (light)
 2011-05-31 16:02:41 -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
Joe Onorato
6a045ca18f Merge commit 'fce12613' into HEAD 
Conflicts:
	core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
	core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout/status_bar_latest_event_content_large_icon.xml

Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
 2011-05-31 14:11:58 -07:00
Amith Yamasani
42f53c7e6c am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 
* commit 'eb01203447afd2606b77739a0bd0b2ea216756e4':
  Use Holo background and proper padding for App Permissions UI.
 2011-05-31 14:06:38 -07:00
Amith Yamasani
eb01203447 am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 
* commit '0119a67e72790fb14b05130e18fa0785b4fa8531':
  Use Holo background and proper padding for App Permissions UI.
 2011-05-31 14:02:11 -07:00
Amith Yamasani
0119a67e72 Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 2011-05-31 13:58:34 -07:00
RoboErik
be01039a7f Work on changing syncx to cal_syncx 
Change-Id: I756ff09c43f39ad52a8793011d3192d59eb574eb
 2011-05-31 13:25:10 -07:00
Amith Yamasani
ff7705e1d3 Use Holo background and proper padding for App Permissions UI. 
Bug: 4515158
Change-Id: I47a8f2fbdc2547dd08e199ccbfa51710048963ae
 2011-05-31 13:03:59 -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
Marco Nelissen
9743547cde Fix crash when nesting Picture recording. 
b/4490619, http://code.google.com/p/android/issues/detail?id=16644

Change-Id: Ia227c87cba61e0d0b6f86b01a064a3eefe447fe1
 2011-05-31 10:23:41 -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
e6a406753e Merge "Fix input type judgment of WebTextView" 2011-05-31 01:55:32 -07: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
satok
9b4157935a Use isAuxiliary instead of ExtraValue for the auxiliary subtypes. 
Change-Id: Ibce4f884e697ca789b9942cf3abad43741040a87
 2011-05-30 22:44:48 +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
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
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