Adam Powell
b30dda6b55
am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit '036c40f443a6d83881bc336a94b5da41bbc0bbcc':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:53:15 -07:00
Dianne Hackborn
c11f6c3e33
am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
...
* commit '7cae137ed155f2d311f020bbb3e75730344fd5fc':
Compatibility mode never needed for normal size screens.
2011-06-01 12:51:08 -07:00
Adam Powell
036c40f443
am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit 'fa8ee17702a79a2597670374679a0b1952f4630f':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:49:47 -07:00
Adam Powell
fa8ee17702
Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
2011-06-01 12:48:03 -07:00
Dianne Hackborn
7cae137ed1
am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
...
* commit '79841acb6275348b4747d30bae6d813e15b1425d':
Compatibility mode never needed for normal size screens.
2011-06-01 12:47:29 -07:00
Dianne Hackborn
b9e2f68b28
am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511 : Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
...
* commit '13e2bef4f67c5bc5ce93aade1431ae3332d361f0':
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
2011-06-01 12:43:35 -07:00
Dianne Hackborn
39ec8fb957
Compatibility mode never needed for normal size screens.
...
Change-Id: I3482fa692618b9272e1e19384e766a77f2a53c5d
2011-06-01 12:42:55 -07:00
Dianne Hackborn
13e2bef4f6
am 80cf4e79: Merge "Fix issue #4500511 : Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
...
* commit '80cf4e79d2acd1f94b6a9866255459c6ab2760be':
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
2011-06-01 12:39:36 -07:00
Dianne Hackborn
a239c84525
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
...
Change-Id: Iebefe924e71206f3e6388eaee64f7b1416bc3239
2011-06-01 12:30:38 -07:00
Fabrice Di Meglio
4f5aa91ba5
Fix View default horizontal direction
...
- set default value to View.HORIZONTAL_DIRECTION_INHERIT
- code refactoring
Change-Id: Ib5b49c8f8ebd6461992bff87603fdbb4b261218e
2011-06-01 11:32:25 -07:00
Justin Koh
3c7b96a346
Framework: bugfix for menu selector not showing up properly.
...
Menu selector wasn't showing up properly because selector state wasn't updated after touch mode. Added this to resurrectselection call.
http://b/issue?id=4372583
TESTED = runs on M4.
Change-Id: I349c3b86f4e8a1a02a20494b547859d0c12867ee
2011-06-01 11:22:01 -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
Gilles Debunne
703d3279e8
Merge "ActionBar makes room for icons when no title is provided"
2011-06-01 10:12:11 -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
Dianne Hackborn
c691d7f9a3
am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2
...
* commit 'b8d109318f6fc88d1a59ca0e6e362963cd06960c':
Forgot this file.
2011-05-31 18:33:00 -07:00
Dianne Hackborn
b8d109318f
am fd206560: Merge "Forgot this file." into honeycomb-mr2
...
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
Forgot this file.
2011-05-31 18:30:01 -07:00
Dianne Hackborn
fd20656067
Merge "Forgot this file." into honeycomb-mr2
2011-05-31 18:28:50 -07:00
Dianne Hackborn
363456c724
Forgot this file.
...
Change-Id: I8aa457d8d81d283f8cc36f68eca33fcb3a86ccad
2011-05-31 18:27:49 -07:00
Dianne Hackborn
7322e557cf
am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672 : Wrong xml resources used for homescreen widgets." into honeycomb-mr2
...
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
Fix issue #4502672 : Wrong xml resources used for homescreen widgets.
2011-05-31 18:11:29 -07:00
Dianne Hackborn
a4cfcf10cc
am 75d6b3c2: Merge "Fix issue #4502672 : Wrong xml resources used for homescreen widgets." into honeycomb-mr2
...
* commit '75d6b3c2a24224e41e87685db0d9d0b8abea091d':
Fix issue #4502672 : Wrong xml resources used for homescreen widgets.
2011-05-31 18:08:27 -07:00
Dianne Hackborn
75d6b3c2a2
Merge "Fix issue #4502672 : Wrong xml resources used for homescreen widgets." into honeycomb-mr2
2011-05-31 18:05:26 -07:00
Matthew Xie
646590ef0a
Merge "Add public api BluetoothSocket.isConnected."
2011-05-31 18:04:36 -07:00
Dianne Hackborn
2f0b17573d
Fix issue #4502672 : Wrong xml resources used for homescreen widgets.
...
There was a race in the system process between applying the initial
configuration and executing code in higher-level system services
like the app widget service that relies on the config. For some
reason it starting showing up more after my code changes; it should
now be completely fixed.
Also fix the activity starting window to run in compatibility mode
if its application is going to be in compatibility mode.
And some various cleanup and small fixes.
Change-Id: I0566933bf1bbb4259c1d99a60c0a3c19af1542e5
2011-05-31 18:04:14 -07:00
Gilles Debunne
c619e74cc6
ActionBar makes room for icons when no title is provided
...
Change-Id: I5bd09e00b50496032deda40ea22367d727230611
2011-05-31 17:15:09 -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
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
Robert Greenwalt
97ab2d4f86
Reveal some network constants.
...
Since we've already decided to inc the sdk version we should try to get these in too.
bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
2011-05-31 12:06:08 -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
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