76420 Commits

Author SHA1 Message Date
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
Adam Cohen
dfed49a285 Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 2012-05-02 10:38:01 -07:00
Gilles Debunne
fd5bc01f70 Better horizontal internal scroll handling in Text.
Bug 6378843

Corrects CL 183460, which would clip text with a width greater than
twice the TextView's width.

Internal horizontal translation is now handled in a similar way to
vertical scrolling.

Internal scrolling is indeed handled by the TextView, which translates
the canvas and sets the clipping bounds accordingly.

When drawing the internal DL, we tighten the horizontal bounds like we
did for the vertical bounds using top and bottom. As in Touch.java, we
use the getHorizontallyScrolling() method to know if we indeed have to
measure the actual text width.  If there is no horizontal scrolling we
use the TextView's width as a safe upper estimate in order to avoid an
actual computation. Note that horizontal scrolling is typically only
used for long single-lined text, so that the measurement loop is quick.

As a result, the internal DLs represent the entire text, and there is no
need to invalidate them when an internal scrolling takes place. This
behavior replaces the draw-only-what-is-needed we had before, but is
more consistent with what we do for long texts inside of a ScrollView
with no noticeable performance change, even on very long text.

Change-Id: I47c24c0ae988547d4f1e9f87d136225c93a3056d
2012-05-02 10:30:03 -07:00
Matthew Xie
44c727943e am 478b2194: am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev
* commit '478b2194e3729fc06221e94161e18c2d31884bf1':
  Check null of address in onDeviceCreated
2012-05-02 10:20:34 -07:00
Matthew Xie
478b2194e3 am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev
* commit 'e318c9a5f1819e953a2c78b32bced3c7fc427dbf':
  Check null of address in onDeviceCreated
2012-05-02 10:17:32 -07:00
Matthew Xie
e318c9a5f1 Merge "Check null of address in onDeviceCreated" into jb-dev 2012-05-02 10:15:00 -07:00
Irfan Sheriff
de1e9fa9fb P2p fixes
- Fix group idle settings
- Fix provision discovery event handling. We only care about device address.
- Fix WPS setup at start

Bug: 6427634
Change-Id: I0b1a7d73199e373350001114f4607bc39f2a53ba
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-05-02 10:02:56 -07:00
Adrian Ludwig
dc410cb349 Reorganizing permissions into groups oriented around user-understandable concepts.
These groups are assigned priority for sort-order when displayed to users, and use
the new permissionGroupFlags to indicate whether they contain personalInfo.

Change-Id: I27e81912e08b8d7766b8ce449b4b3bd6473d8f07
2012-05-02 09:56:41 -07:00
Adam Cohen
d2097ebacf Changing app widget "extras" to "options" and another small API Review issue
-> (issue 6427146), (issue 6427861)

Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
2012-05-02 09:32:42 -07:00
satok
8d47ec4e80 am c6b93978: (-s ours) am e849230f: Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev
* commit 'c6b939789a8fd3efcac2b71fc2baeb4442fbe1e8':
  DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
2012-05-02 01:46:16 -07:00
satok
c6b939789a am e849230f: Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev
* commit 'e849230f444653e692024b4321044cb9f6188919':
  DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
2012-05-02 01:43:17 -07:00
satok
e849230f44 Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 2012-05-02 01:41:23 -07:00
satok
1bc0a49e3c DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
Bug: 5137498
Change-Id: Ieb8fd700d193eddaa31b0c5ebd8c7f7885586372
2012-05-02 17:30:45 +09:00
satok
fb04fa5ff4 Merge "Reduce window resizing during IME transition" 2012-05-02 01:28:00 -07:00
Svetoslav Ganov
42c5cb3028 Adding title for the date picker dialog if the calendar is not shown.
1. The date picker dialog shows spinners and a mini calendar on
   tablet but on on phone the calendar is not show and the user
   does not know the day of the week otherwise show on the mini
   calendar.

bug:5264972

Change-Id: I06aeb7ba1ad34d4e99628d9586ff2777e981c963
2012-05-02 01:02:43 -07:00
Craig Mautner
83339b465c Fix Home key causes wrong animation
Wallpaper logic assumed that if mWallpaperTarget was non-null then
any wallpaper animation should be exiting. However, if the existing
wallpaper target was already animating away then mWallpaperTarget
remains non-null until it is completely gone. Pressing Home during
this time was causing the next animation to exit rather than reverse
and enter.

This fix looks to see if the wallpaper target is animating and if it
is to treat it as null for the purpose of determining which direction
the animation should go.

Fixes bug 6407941.

Change-Id: I731267328db0f9972a5aed6f214962f96737dd07
2012-05-01 22:13:23 -07:00
Adam Powell
53dc75339a am a60ce985: am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev
* commit 'a60ce9859366b66bcec2a16414abbd670d988de1':
  API modifications for TaskStackBuilder
2012-05-01 19:17:28 -07:00
Jeff Brown
140651b3a0 am 8802ef02: am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev
* commit '8802ef02cb2ccb96ef46c9b2d76fa496b484ccfc':
  Use EVIOCSCLOCKID correctly.
2012-05-01 19:14:43 -07:00
Adam Powell
a60ce98593 am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev
* commit '39f412d8deed2ba46153c8a819bc8635979cec6b':
  API modifications for TaskStackBuilder
2012-05-01 19:14:35 -07:00
Jeff Brown
8802ef02cb am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev
* commit '69387f432d54f117ea7effa691925a3b918246e4':
  Use EVIOCSCLOCKID correctly.
2012-05-01 19:11:48 -07:00
Adam Powell
39f412d8de Merge "API modifications for TaskStackBuilder" into jb-dev 2012-05-01 19:10:32 -07:00
Jeff Brown
69387f432d Merge "Use EVIOCSCLOCKID correctly." into jb-dev 2012-05-01 19:09:44 -07:00
Adam Powell
f78a8444a9 API modifications for TaskStackBuilder
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
2012-05-01 18:51:40 -07:00
Jeff Brown
92f29230ed am c3cca664: am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev
* commit 'c3cca66404571454ee13b341925fe45efd5036e6':
  Improve handling of built-in keyboard.
2012-05-01 18:44:02 -07:00
Jeff Brown
a75fe05b6e Use EVIOCSCLOCKID correctly.
Bug: 6382031
Change-Id: I87b0887ce867a79758bcd24e2202280270faaf8c
2012-05-01 18:41:26 -07:00
Jeff Brown
c3cca66404 am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev
* commit '0632b35b6828cd4324b3d218c2e38f895e819aad':
  Improve handling of built-in keyboard.
2012-05-01 18:41:00 -07:00
Jeff Brown
0632b35b68 Merge "Improve handling of built-in keyboard." into jb-dev 2012-05-01 18:39:00 -07:00