76446 Commits

Author SHA1 Message Date
Jim Miller
07fd2a9b81 am 07a42cfc: am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev
* commit '07a42cfcd4e193b1c7a5842ca003fc661fc1bf4b':
  Revert "Fix for layout parameter validation bug in GridLayout."
2012-05-02 16:06:01 -07:00
Jim Miller
07a42cfcd4 am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev
* commit '1771ee34d1d308193e61a1b75368149f2d06aa6c':
  Revert "Fix for layout parameter validation bug in GridLayout."
2012-05-02 16:02:38 -07:00
Jeff Sharkey
2d6c580262 Support full 32 bits for socket tags.
Bug: 5321184
Change-Id: Iadb3a4ad541ef012cea35b70ad440eca4c879f42
2012-05-02 16:01:14 -07:00
Jim Miller
1771ee34d1 Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev 2012-05-02 15:59:27 -07:00
Jim Miller
782c04b864 Revert "Fix for layout parameter validation bug in GridLayout."
This reverts commit 8a36e05443f13edde1eae0cf6ea01b3b2da6e637 which was causing
keyguard_screen_tab_unlock.xml to have a bad layout.

Change-Id: I50bdc6dbdf8d7b98ef77eae532860d375574213e
2012-05-02 15:50:30 -07:00
Adam Powell
8015d3fa25 am 020d5322: am fbbdbc2d: Merge "Fix setting action bar home-as-up from AB style" into jb-dev
* commit '020d53224c26edcf643a2a305868e8e8b479c0a4':
  Fix setting action bar home-as-up from AB style
2012-05-02 15:47:54 -07:00
Adam Powell
020d53224c am fbbdbc2d: Merge "Fix setting action bar home-as-up from AB style" into jb-dev
* commit 'fbbdbc2d2326e96ce31950baccddd2f295fe594c':
  Fix setting action bar home-as-up from AB style
2012-05-02 15:44:45 -07:00
Adam Powell
fbbdbc2d23 Merge "Fix setting action bar home-as-up from AB style" into jb-dev 2012-05-02 15:42:23 -07:00
Ruei-sung Lin
f4b403159f Fix b/5974247
Change-Id: I8c5cf035f195142607875739604d163c7a43e305
2012-05-02 15:16:57 -07:00
Brian Colonna
3018997534 Fix 6396479: Made FUL unlock layout look good on nakasi
For the portrait layouts, the size of the unlock view was reduced
because it was outside the bottom bounds of the screen, making it
look much wider than it was high.  The fix makes it look square.

For the landscape layouts, the size of the unlock view was increased
because it was leaving only thin slivers of background space on the
top and bottom.  It now fills the entire right half of the screen.

This was also tested on the Xoom to make sure it looks reasonable on
10 inch tablets, even though FUL doesn't ship on the Xoom.

Change-Id: I969912a944d20560d31729806273dec47aaa6ecb
2012-05-02 17:58:25 -04:00
Winson Chung
9035d85a87 am 21a75218: am 3e1cf5b4: Merge "Updating task and fragment transitions. (Bug 5285022)" into jb-dev
* commit '21a75218b0d63a50956415fd309652b7a3c74ff0':
  Updating task and fragment transitions. (Bug 5285022)
2012-05-02 14:55:50 -07:00
Winson Chung
21a75218b0 am 3e1cf5b4: Merge "Updating task and fragment transitions. (Bug 5285022)" into jb-dev
* commit '3e1cf5b423c31301fd17605c752d68a883048f77':
  Updating task and fragment transitions. (Bug 5285022)
2012-05-02 14:53:30 -07:00
Winson Chung
3e1cf5b423 Merge "Updating task and fragment transitions. (Bug 5285022)" into jb-dev 2012-05-02 14:51:08 -07:00
Winson Chung
bd127f0966 Updating task and fragment transitions. (Bug 5285022)
Change-Id: Iae7cc88d7b608360455956488562a40cbdb725f9
2012-05-02 14:49:28 -07:00
Eric Fischer
bf62981d33 am 5b18fb8c: (-s ours) am 46bba663: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '5b18fb8cba2496865a13f9e4a635e3848609dd7f':
  Import translations. DO NOT MERGE
2012-05-02 14:48:01 -07:00
Eric Fischer
5b18fb8cba am 46bba663: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '46bba66318358a9ddd247035ae65e888c307f567':
  Import translations. DO NOT MERGE
2012-05-02 14:45:48 -07:00
Eric Fischer
6d668e0120 Merge "Import translations. DO NOT MERGE" 2012-05-02 14:43:54 -07:00
Eric Fischer
46bba66318 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-02 14:43:45 -07:00
Irfan Sheriff
2c02da2bc6 Fix reference counting of wifi locks
Bug: 6105898
Change-Id: I7368de91fa4aa63fd97dda0ee91d810aaaa53d8b
2012-05-02 14:40:16 -07:00
Svetoslav Ganov
52a623700f Virtual nodes are always important for accessibility.
1. Virtual nodes should be made important since the implementer of
   the tree represented by the nodes decides which node to report.
   In the case with native widgets we decide in the framework but
   in the case of the node provider, the implementer of the latter
   makes the call. Hence, if a node in not important the provider
   should not report it in the first place. The issue this patch
   solves is to allow events from virtual nodes to be propagated
   to the accessibility services.

bug:6432588

Change-Id: Ie01f84e9e0ef2280da934b98283962a5db38abc2
2012-05-02 14:19:41 -07:00
Matthew Xie
7f58b36fec Always move Bluetooth Adapter to cold state when turn off Bluetooth.
quick switch feature introduced in ICS does not work very well. Reported
logs indicate the Bluez stack cannot sustain the long time ON/hotoff state.
This change will always move the adapter to code but move it to hotoff
to be able to turn on quickly.
bug 5792792

Change-Id: I41c39d4bf11bb5eb3cd83279e8ec81e01774e008
2012-05-02 14:15:10 -07:00
Adam Powell
d40423a7ad Fix setting action bar home-as-up from AB style
Bug 6427860

Change-Id: I0052417a2c97560ade768509781b27b5e064660d
2012-05-02 14:06:03 -07:00
Jeff Sharkey
b8b8de8378 am cff5d25d: am 6f28f9ef: Merge "Push existing rules when netd reconnects." into jb-dev
* commit 'cff5d25da87c97e927d382c6eead2672c72cc9ed':
  Push existing rules when netd reconnects.
2012-05-02 13:53:28 -07:00
Jeff Sharkey
cff5d25da8 am 6f28f9ef: Merge "Push existing rules when netd reconnects." into jb-dev
* commit '6f28f9ef315e3b5190259a943be91ecfafc69103':
  Push existing rules when netd reconnects.
2012-05-02 13:51:14 -07:00
Jeff Sharkey
6f28f9ef31 Merge "Push existing rules when netd reconnects." into jb-dev 2012-05-02 13:48:30 -07:00
Jeff Sharkey
e1d330a071 Set tmpdir to application cache directory.
Otherwise File.createTempFile() uses /sdcard which most apps don't
have write access to.

Bug: 6347289
Change-Id: Ibde191a63e4dbb9b03437406f8c999f192bcfa21
2012-05-02 13:47:37 -07:00
Eric Fischer
bf7cd9506c Import translations. DO NOT MERGE
Change-Id: I82be8154049bdfd39f3e8d6d1aabc0e61ac3505c
2012-05-02 13:03:06 -07:00
Eric Fischer
ef3e44f69a Import translations. DO NOT MERGE
Change-Id: I5ae8fc8c95a47a3b981a10bf2218c774de71627f
2012-05-02 12:58:28 -07:00
Adam Powell
98423989b8 am 56de3296: am 0cd4f671: Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev
* commit '56de329630384891f6ebc3a623128e8261957388':
  Fix documentation of Activity#navigateUpTo() to describe its actual behavior.
2012-05-02 12:07:15 -07:00
Gilles Debunne
98c6f8f4e6 am 0bab2b06: am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev
* commit '0bab2b068c63508b1f20e182d86f09ab06a88fef':
  Better horizontal internal scroll handling in Text.
2012-05-02 12:07:13 -07:00
Chet Haase
64d6143c0d am dcc81035: am fe5984f4: Merge "Corrects invalidation logic for layered views" into jb-dev
* commit 'dcc81035423c1c221409f20b28ba94a8ca74d55d':
  Corrects invalidation logic for layered views
2012-05-02 12:04:21 -07:00
Adam Powell
56de329630 am 0cd4f671: Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev
* commit '0cd4f6718b3d9b9d147a28e32bbb3c0f9147d5a9':
  Fix documentation of Activity#navigateUpTo() to describe its actual behavior.
2012-05-02 12:03:31 -07:00
Gilles Debunne
0bab2b068c am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev
* commit '54562cfbcd97a3b9d3ac9fb74f7a0d0d4bb9b8a0':
  Better horizontal internal scroll handling in Text.
2012-05-02 12:03:29 -07:00
Chet Haase
dcc8103542 am fe5984f4: Merge "Corrects invalidation logic for layered views" into jb-dev
* commit 'fe5984f43a5be9f95d1febb806f3aee8601c7ff4':
  Corrects invalidation logic for layered views
2012-05-02 12:00:24 -07:00
Adam Powell
0cd4f6718b Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 2012-05-02 11:59:55 -07:00
Gilles Debunne
54562cfbcd Merge "Better horizontal internal scroll handling in Text." into jb-dev 2012-05-02 11:59:54 -07:00
Chet Haase
fe5984f43a Merge "Corrects invalidation logic for layered views" into jb-dev 2012-05-02 11:56:56 -07:00
Irfan Sheriff
7044f5c2ba am 7a224b0f: am d07223f8: Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev
* commit '7a224b0f339c62f34fd2b1e20be225bd7ff8deb8':
  Fix getConfiguredNetworks when wifi is disabled
2012-05-02 11:46:41 -07:00
Irfan Sheriff
7a224b0f33 am d07223f8: Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev
* commit 'd07223f8294bbc32c9dbbee295e5c0739ce09550':
  Fix getConfiguredNetworks when wifi is disabled
2012-05-02 11:44:19 -07:00
Irfan Sheriff
d07223f829 Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev 2012-05-02 11:42:09 -07:00
Irfan Sheriff
a3cbe75c93 Fix getConfiguredNetworks when wifi is disabled
Bug: 6380917
Change-Id: I4c6f1a379ef2401cde739aedfc82578c03e7dcf3
2012-05-02 11:39:54 -07:00
Adam Powell
35c064b2e8 Fix documentation of Activity#navigateUpTo() to describe its actual
behavior.

Change-Id: I804fcef5df6f5885b47b7a1c7703ed301bea09b0
2012-05-02 11:38:57 -07:00
Jean-Michel Trivi
f26f01784e Make AudioService aware of device orientation changes
If the "ro.audio.monitorOrientation" system property is
 defined and true, monitor device configuration changes
 and see if the device orientation changed. If it did,
 set the "orientation" audio system parameter to one
 of "landscape", "portrait", "square" or "undefined".
Set orientation when starting AudioService, and
 when media server restarts.

Change-Id: Idce548f93abf3aab30149e5952daaa7051630232
2012-05-02 11:20:22 -07:00
Irfan Sheriff
b86a020c4d am 78e23609: am 7a6a4bf1: Merge "P2p fixes" into jb-dev
* commit '78e2360950d31b30b5509b481805ebb1e97c9499':
  P2p fixes
2012-05-02 11:18:45 -07:00
Irfan Sheriff
78e2360950 am 7a6a4bf1: Merge "P2p fixes" into jb-dev
* commit '7a6a4bf1b5905d3136ca883fff1d432e7c260298':
  P2p fixes
2012-05-02 11:16:27 -07:00
Irfan Sheriff
7a6a4bf1b5 Merge "P2p fixes" into jb-dev 2012-05-02 11:14:21 -07:00
Adam Cohen
e100fb16a3 am 9edbb235: am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev
* commit '9edbb235779d16e768143f47c241c56a422df580':
  Changing app widget "extras" to "options" and another small API Review issue
2012-05-02 11:11:14 -07:00
Adam Cohen
9edbb23577 am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev
* commit 'dfed49a2852e9336e212f6934dcddec7dd743c26':
  Changing app widget "extras" to "options" and another small API Review issue
2012-05-02 11:08:17 -07:00
Jeff Sharkey
b24a78589b Push existing rules when netd reconnects.
When netd drops its socket connection to framework, assume that it
has restarted, and push any existing rules to keep netd and iptables
consistent.

Bug: 6376246
Change-Id: Id93138938321bcf885eb0e4fecaff8b150cfdfcf
2012-05-02 10:55:08 -07:00
Chet Haase
810a8676df Corrects invalidation logic for layered views
A bug in the invalidation logic meant that changes to a view
would not cause parents in the view hiearchy that were set to have
a layer (e.g., View.LAYER_TYPE_HARDWARE) to get invalidated properly.
So even though the child view was all set to recreate its display list
according to the property change, the layer in the tree above it would stay
as-is, meaning that the change would not show up on the screen.

Issue #5887530 DropTarget text does not change color with the icon

Change-Id: Ie6eac4f406d172cb437822d9fe76340ab2afaf1c
2012-05-02 10:44:33 -07:00