200016 Commits

Author SHA1 Message Date
Baligh Uddin
5aecb21d8b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:25 +00:00
Baligh Uddin
396c4a7345 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:23 +00:00
Baligh Uddin
6fad59a41a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:43:21 +00:00
Baligh Uddin
2deb87d4df Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:14 +00:00
Baligh Uddin
ce992f1b58 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:12 +00:00
Justin Harrison
91f2123b2a Merge "Add support for setting color transforms" into mnc-dr-dev 2015-09-19 00:21:41 +00:00
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
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
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
0950592123 Import translations. DO NOT MERGE
Change-Id: I41869ce6fb7b24530a7fd0b66eb244b9d1a7821d
Auto-generated-cl: translation import
2015-09-18 13:57:25 -07:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00: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
1b67a6b84d Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev 2015-09-18 16:25:30 +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
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
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
Tim Murray
952d5b334c Merge "Send power hint on fling gestures." into mnc-dr-dev 2015-09-17 02:24:32 +00:00
Michael Wright
a4d22d718a Send power hint on fling gestures.
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.

bug 24059298

Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
2015-09-17 00:18:13 +00:00
Jorim Jaggi
18f18ae078 Allow camera launch also when device is interactive
Bug: 23967648
Change-Id: If91df75e6325b3969dc2351a70af0c160d3eab04
2015-09-16 23:44:56 +00:00
Adam Powell
39e94ebe22 Handle single-choice ChooserActivities and bound ChooserTargetServices
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.

Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.

Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.

Bug 23152483

Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit 9761ab2a645a4643bd20619c7c148ef07e0dd39d)
2015-09-16 19:54:24 +00:00
Fyodor Kupolov
bfc584df68 Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 2015-09-16 19:37:47 +00:00
Jack Yu
870a9e6a78 Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev 2015-09-16 19:15:49 +00:00
Chris Tate
3290f5dd06 Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 2015-09-16 17:05:07 +00:00
Andres Morales
38e6e4ef98 Merge "reset lockout deadline on device reboot" into mnc-dr-dev 2015-09-16 16:04:56 +00:00
Zach Jang
2b564bf42a am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '716c6269674474867dc4720f86f739c639c83400':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 02:16:04 +00:00
Zach Jang
0098cbc011 am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '971ff47c75889a2fc4ac710fbe62ba819feeaba6':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 02:16:00 +00:00
Zach Jang
716c626967 am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '63348ae4572cd9394e79fe343d2fca2b38498d1c':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 02:06:31 +00:00
Zach Jang
971ff47c75 am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '1b06455e44395489dcd027a170e68eabf2ebe1da':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 02:06:26 +00:00
Zach Jang
63348ae457 am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 01:56:57 +00:00
Zach Jang
1b06455e44 am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 01:56:52 +00:00
Zach Jang
11317e82cf am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 01:44:58 +00:00
Zach Jang
00db082656 am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 01:44:53 +00:00
Zach Jang
32a420ea36 Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 2015-09-16 01:40:18 +00:00
Zach Jang
3ee9945be3 Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
2015-09-16 01:38:41 +00:00
Zach Jang
203b43547d Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 2015-09-16 01:37:36 +00:00
Lorenzo Colitti
7198c0aa4c Merge "Framework fixes for RSSI offload." into mnc-dr-dev 2015-09-16 00:54:57 +00:00