201433 Commits

Author SHA1 Message Date
Tim Kilbourn
0eb10ede23 Merge "Always set the usb config when modifying it." into mnc-dr-dev 2015-09-18 23:55:56 +00:00
Michael Wright
58e829f71d Add support for setting color transforms
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
2015-09-18 23:37:28 +00:00
Vineeta Srivastava
7e765dd7f5 am 22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev
* commit '22fe39b49c1d7cb22d8dfbb4f8e98af28be48a24':
  set config_use_sim_language_file false for SE Telia/Sweden 3G
2015-09-18 22:21:36 +00:00
Adam Lesinski
dd0238ec7d am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit 'e54253bdd317cbe806225081ad9ebe64f2b50b9a':
  Fix crash when no power_profile is specified
2015-09-18 22:21:31 +00:00
Vineeta Srivastava
22fe39b49c Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev 2015-09-18 22:19:41 +00:00
Adam Lesinski
e54253bdd3 Merge "Fix crash when no power_profile is specified" into mnc-dr-dev 2015-09-18 22:15:19 +00:00
sangjoon84.lee
d4bcb286fb set config_use_sim_language_file false for SE Telia/Sweden 3G
BUG=24184934

Change-Id: I721b3e6c29b78a792a15ab4ba72a81a3f4ce270d
2015-09-18 15:15:16 -07:00
Tim Kilbourn
823e805c1c Always set the usb config when modifying it.
On some devices, setting system properties takes too long and we end up
with races where adbd gets killed and never comes back. With this
change we avoid a small optimization that checks the previous value of
the config, instead opting to set it every time.

Bug: 23631400
Change-Id: I7567cc2efb3d5d15c45334bd66b28877a2af0ac3
2015-09-18 15:05:57 -07:00
Adam Lesinski
8057133d49 Fix crash when no power_profile is specified
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.

Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
2015-09-18 14:56:34 -07:00
Christine Hallstrom
13c23df90c Merge "Manual 'cherry pick' to fix CTS tests for MediaControllerTest." into cw-e-dev 2015-09-18 21:29:09 +00:00
Christine Hallstrom
2eb7d4761e Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
This is to manually apply a patch of code that should have
propagated to E, but hasn't and is breaking one of the CTS
tests for MediaControllerTest on Nemo.

The original reverted change can be found at ag/723643.

Bug: 24172957
Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc
2015-09-18 21:27:38 +00:00
Baligh Uddin
a9fc533b09 Import translations. DO NOT MERGE
Change-Id: I08b112bde5280593b52c7aa50b56d41092f94056
Auto-generated-cl: translation import
2015-09-18 14:17:59 -07:00
Baligh Uddin
550ac93a79 Import translations. DO NOT MERGE
Change-Id: I81add884ffd46b17bed8f38abb835c79aeb4752f
Auto-generated-cl: translation import
2015-09-18 14:15:54 -07:00
Baligh Uddin
c05142c052 Import translations. DO NOT MERGE
Change-Id: Ie83919c03d360d8955701954b4888e0e7ac51aae
Auto-generated-cl: translation import
2015-09-18 14:06:53 -07:00
Baligh Uddin
0472798681 Import translations. DO NOT MERGE
Change-Id: I1a186ed5db66f57c223a432802d130165bfcb5d4
Auto-generated-cl: translation import
2015-09-18 14:04:36 -07:00
Baligh Uddin
05b6999600 Import translations. DO NOT MERGE
Change-Id: I31f62d18cace1e7b37b900f94e624e9fc1762f2f
Auto-generated-cl: translation import
2015-09-18 14:02:31 -07:00
Baligh Uddin
0950592123 Import translations. DO NOT MERGE
Change-Id: I41869ce6fb7b24530a7fd0b66eb244b9d1a7821d
Auto-generated-cl: translation import
2015-09-18 13:57:25 -07:00
Baligh Uddin
89b82af868 Import translations. DO NOT MERGE
Change-Id: Id3a7092d59391fd20c2b643551eee8a2c6cf104b
Auto-generated-cl: translation import
2015-09-18 13:55:23 -07:00
Baligh Uddin
23b4cd339e Import translations. DO NOT MERGE
Change-Id: Iccdea720e2b636f99e014f195772bff4a0afc149
Auto-generated-cl: translation import
2015-09-18 13:53:19 -07:00
Baligh Uddin
ebca452900 Import translations. DO NOT MERGE
Change-Id: Ibf24678007e2bdc2e06c8c1b1f3372cb3d6ccd18
Auto-generated-cl: translation import
2015-09-18 13:51:14 -07:00
Baligh Uddin
be68905bac Import translations. DO NOT MERGE
Change-Id: I5087d6db12e2b7ac013404d8d08de6561ce5b54e
Auto-generated-cl: translation import
2015-09-18 13:49:07 -07:00
Baligh Uddin
9255a86447 Import translations. DO NOT MERGE
Change-Id: I28973f9307de9323e13d9ef26b0fd652a8ffb578
Auto-generated-cl: translation import
2015-09-18 13:47:06 -07:00
Baligh Uddin
123247a68e Import translations. DO NOT MERGE
Change-Id: I9aa0f770c1b5b738d9210fd95bab56d8ddb793e1
Auto-generated-cl: translation import
2015-09-18 13:44:58 -07:00
Baligh Uddin
37da62e90c Import translations. DO NOT MERGE
Change-Id: I4a03a04f3c0915132a8dcb8102a7e203f2ecba07
Auto-generated-cl: translation import
2015-09-18 13:42:47 -07:00
Adam Lesinski
4e86aae667 am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '680553957e4ff47343334881c34de6969b2ed977':
  BatteryStats: Better big-little CPU accounting
2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00:00
Gus Prevas
e82f3c977c Allows starting window to be shown for swipe-dismiss windows.
This change removes the hack in WindowManagerService which
prevented a starting window from being created for a window with
the swipe-to-dismiss flag set.  Per the comment in the file, a
starting window is not created for translucent windows (which a
swipe-to-dismiss window implicitly is) because the translucency
of the window interacts poorly with the default entry transition;
this does not apply to swipe-to-dismiss windows as they use a
different entry transition.

Removing this allows us to start the transition before the app
has finished drawing its UI (showing the app's theme's
default background drawable as suggested in
https://spec.googleplex.com/quantum/patterns/launch-screens.html)
which makes app launching on Wear much more responsive.

Bug: 23066614
Change-Id: I99b85aeb9a9fcce277239b6f430691c3abf86177
2015-09-18 14:42:01 -04:00
Baligh Uddin
9845335c7a Import translations. DO NOT MERGE
Change-Id: I61591ecfb78bae60091771b015e0898570f55abe
Auto-generated-cl: translation import
2015-09-18 10:22:02 -07:00
Baligh Uddin
41cb1b8aac Import translations. DO NOT MERGE
Change-Id: I5b25c04b472923b1334df87d5a271d3164694d20
Auto-generated-cl: translation import
2015-09-18 10:18:08 -07:00
Adam Powell
5f22c0b27a am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '1b67a6b84d133e1fdac352d0821034ceca739a71':
  Badge ChooserActivity choices with their app icon for disambig
2015-09-18 16:33:57 +00:00
Adam Powell
1b67a6b84d Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev 2015-09-18 16:25:30 +00:00
Jeff Sharkey
e1a6299b99 Relax locking when scanning private volumes.
Private volumes with many large apps can take a long time to scan,
which currently happens on the main thread with several large locks
held, making it likely to trigger the system-wide watchdog.

This change relaxes this locking by scanning on the PackageManager
worker thread, and by only holding locks when required.  In
particular, we release the installer lock between each scan to give
other apps waiting to dexopt a chance to breathe.

Bug: 24172036
Change-Id: Ie28d3ff72d6be28fa2f72c57d5e4146c768df89d
2015-09-17 19:13:40 -07:00
Shishir Agrawal
04feedd439 am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev
* commit '896f738cdddec8cfda82b177e3a60c5a85004229':
  Allow non-persistent manual network selection.
2015-09-18 02:02:11 +00:00
Shishir Agrawal
896f738cdd Merge "Allow non-persistent manual network selection." into mnc-dr-dev 2015-09-18 01:49:58 +00:00
Jorim Jaggi
5c2bfa8ff0 am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
* commit '58e378b02561d8f606066537b193b0eb62e2404f':
  Start fingerprint authentication in onStartedGoingToSleep
2015-09-18 00:48:47 +00:00
Jorim Jaggi
dc09ffad2a am 5c0c5ac8: Handle case correctly when screen times out and locking immediately
* commit '5c0c5ac84552f80ddadc43f451c3a28c5c8c8f84':
  Handle case correctly when screen times out and locking immediately
2015-09-18 00:48:41 +00:00
Jorim Jaggi
58e378b025 Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev 2015-09-18 00:41:31 +00:00
Jorim Jaggi
95e4038bb1 Start fingerprint authentication in onStartedGoingToSleep
We used to start fingerprint authentication in onFinishedGoingToSleep.
This was a UX issue because then users couldn't place the finger on
the sensor immediately after pressing the power button because
onFinishedGoingToSleep is significantly delayed (around 900ms after
pressing the power button).

Bug: 23570959
Change-Id: I0bf557ebd10e6a8b033ab98a78aa338bf6538dcc
2015-09-18 00:39:13 +00:00
Jorim Jaggi
5c0c5ac845 Handle case correctly when screen times out and locking immediately
In case the the screen timed out and the setting was set to "lock now"
in case the screen times out, we locked before finished going to sleep,
leading to all kinds of state messups in Keyguard, including an empty
lockscreen when authenticating with fingerprint during that period.

Bug: 23952388
Change-Id: If1629be1171c841d51ec0555422e6108002fdb73
2015-09-17 22:48:07 +00:00
Zach Riggle
3c9ffc2d5a am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit '2ebcf2c28fd1657a98a7dc4a90bcbe7e78f296e9':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
2015-09-17 22:42:18 +00:00
Zach Riggle
2ebcf2c28f am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit 'ad0acf1d104988238f431d874f0ecf9917a06699':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
2015-09-17 22:33:34 +00:00
Zach Riggle
ad0acf1d10 am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit '9836b64f529238d1219f1937abf481383cd0cacd':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
2015-09-17 22:25:53 +00:00
Zach Riggle
9836b64f52 am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit 'f68b1953259a13562f5a2331526edafae5c1d99f':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
2015-09-17 22:17:11 +00:00
Zach Riggle
f68b195325 am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit '683cd049f7c762251567a0e0386ee49bb1428351':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
2015-09-17 22:00:29 +00:00
Zach Riggle
683cd049f7 resolved conflicts for 521def98 to lmp-mr1-dev 2015-09-17 17:34:08 -04:00
Adam Powell
00f4aad704 Badge ChooserActivity choices with their app icon for disambig
When two or more activities with the same user-visible label are
shown, we have traditionally shown the app name or package name if the
app names also match. This was to help the user tell the difference
between multiple apps publishing similar activities and avoid
unintentionally starting the wrong one. However, in the case of
explicit choosers (e.g. ACTION_SEND sharing) a few common collisions
occur in practice and falling all the way back to package name isn't
very helpful.

Instead, we now assume that the app icon, which the user has seen
before at install time, is unique enough on its own to disambiguate
these cases and avoid user confusion. We no longer show the app name
or package name as secondary text in the chooser.

In cases where an activity has a different icon from its containing
app, we now badge the activity icon with the app icon so that the user
knows which app a potentially ambiguous choice belongs to.

Bug 24113937

Change-Id: Ie54fbf77bfcc86e50768f93be2be0e53cf2ce7b5
2015-09-17 20:56:00 +00:00
Zach Jang
b2b3cecbd3 am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:44:41 +00:00
Zach Jang
7b5bf993e4 am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit 'fe4cbf2b1b135b327018915a512a8e6293a96017':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:32:53 +00:00
Zach Jang
fe4cbf2b1b am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:24:00 +00:00
Zach Jang
cff4e09e26 am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:09:55 +00:00