OSDN Git Service

android-x86/frameworks-base.git
9 years agoCEC: Ensure stable AVR connection
Jinsuk Kim [Wed, 28 Jan 2015 22:34:34 +0000 (07:34 +0900)]
CEC: Ensure stable AVR connection

Make sure AVR device removal due to hotplug detection failure occur
in a less strict manner - doing it only if the failure is detected
3 times in a row.

Bug: 19171321
Change-Id: I1479663b05cdc957cc52123799c756f6b74f6708

9 years agoCEC: Stop ARC if hotplug event is asserted low
Jinsuk Kim [Wed, 28 Jan 2015 08:38:28 +0000 (17:38 +0900)]
CEC: Stop ARC if hotplug event is asserted low

Updated to stop ARC as specified in HEAC 2.4 transmission condition.

Bug: 19170947
Change-Id: Ibf797ce3b49f32561ef0c36b6874e7ebe19ed65a

9 years agoCEC: Fix a regression bug
Jinsuk Kim [Wed, 28 Jan 2015 07:44:07 +0000 (16:44 +0900)]
CEC: Fix a regression bug

The HdmiControlService.getActiveSource() has a regression (exception)
when calling getDeviceInfoByPath since method should be called on
a service thread. Introduced a method that can be invoked safely
from the main thread.

Bug: 19170884
Change-Id: I393161e08c916270faf46147a97076bc573b808f

9 years agoMerge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
Jinsuk Kim [Thu, 29 Jan 2015 06:40:46 +0000 (06:40 +0000)]
Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev

9 years agoMerge "aggressively blacklist WifiConfiguration for the purpose of switching network...
vandwalle [Thu, 29 Jan 2015 04:50:42 +0000 (04:50 +0000)]
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev

9 years agoMerge "Change getDeviceId to take phoneId." into lmp-mr1-dev
Stuart Scott [Thu, 29 Jan 2015 01:55:46 +0000 (01:55 +0000)]
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev

9 years agoam 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:54:45 +0000 (00:54 +0000)]
am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.
automerge: 3f9d57d

* commit '3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
  Doc change: Update Ads terms language.

9 years agoam 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:30:37 +0000 (00:30 +0000)]
am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.

* commit '8b1ad8e4d148b70e31d675515e8ad24ca3d12169':
  Doc change: Update Ads terms language.

9 years agoam 49738792: Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:24:39 +0000 (00:24 +0000)]
am 49738792: Doc change: Update Ads terms language.

* commit '497387928d53cca060c3f43b3a9f5c7834564333':
  Doc change: Update Ads terms language.

9 years agoDoc change: Update Ads terms language.
Dirk Dougherty [Thu, 6 Nov 2014 18:58:06 +0000 (10:58 -0800)]
Doc change: Update Ads terms language.

Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643

9 years agoTIF: Do not call session callbacks when the session is already released
Jae Seo [Wed, 28 Jan 2015 23:50:08 +0000 (15:50 -0800)]
TIF: Do not call session callbacks when the session is already released

Bug: 19146382
Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd

9 years agoMerge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
Eino-Ville Talvala [Wed, 28 Jan 2015 23:20:00 +0000 (23:20 +0000)]
Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev

9 years agoMerge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
xinhe [Wed, 28 Jan 2015 21:42:14 +0000 (21:42 +0000)]
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev

9 years agoChange getDeviceId to take phoneId.
Stuart Scott [Wed, 28 Jan 2015 20:35:43 +0000 (12:35 -0800)]
Change getDeviceId to take phoneId.

bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5

9 years agoCamera2 legacy: Do not advertise NV21 support.
Eino-Ville Talvala [Wed, 28 Jan 2015 20:55:12 +0000 (12:55 -0800)]
Camera2 legacy: Do not advertise NV21 support.

Also reduce logging somewhat for common scenarios.

Bug: 19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27

9 years agoMerge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
Jose Lima [Wed, 28 Jan 2015 20:55:51 +0000 (20:55 +0000)]
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev

9 years agoam 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle...
Leon Scroggins III [Wed, 28 Jan 2015 19:09:08 +0000 (19:09 +0000)]
am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13
automerge: 4c6ace6

* commit '4c6ace6fd683133a2d36e4bf9cb48491055e8d5e':

9 years agoFix crash caused by disabling the Options panel on TVs
Jose Lima [Wed, 28 Jan 2015 18:43:15 +0000 (10:43 -0800)]
Fix crash caused by disabling the Options panel on TVs

   Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1

9 years agoSprint: MMS cannot be sent in the UK
xinhe [Wed, 28 Jan 2015 18:40:27 +0000 (10:40 -0800)]
Sprint: MMS cannot be sent in the UK

     This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.

Bug:18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd

9 years agoam 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle...
Leon Scroggins III [Wed, 28 Jan 2015 18:32:20 +0000 (18:32 +0000)]
am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13

* commit '3c9376a5a2cbcad5c6883dad1e938a7924a8dd4d':

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Wed, 28 Jan 2015 18:23:47 +0000 (18:23 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5
automerge: 5d7bd13

* commit '5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2':

9 years agoMerge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
Bryce Lee [Wed, 28 Jan 2015 17:50:38 +0000 (17:50 +0000)]
Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev

9 years agoMerge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
John Spurlock [Wed, 28 Jan 2015 17:48:12 +0000 (17:48 +0000)]
Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev

9 years agoRevert "Make THEATER_MODE_ON setting a system api."
Bryce Lee [Wed, 28 Jan 2015 17:45:35 +0000 (17:45 +0000)]
Revert "Make THEATER_MODE_ON setting a system api."

This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Wed, 28 Jan 2015 17:39:52 +0000 (17:39 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
automerge: 1e0d4b5

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.

9 years agoMerge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
Bryce Lee [Wed, 28 Jan 2015 17:03:56 +0000 (17:03 +0000)]
Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 14:21:29 +0000 (08:21 -0600)]
Import translations. DO NOT MERGE

Change-Id: I1c7abd76bf9a24b5e05058f17d1c64d9051b5f81
Auto-generated-cl: translation import

9 years agoCEC: Let <Active Source> from the active source work
Jinsuk Kim [Wed, 28 Jan 2015 07:37:17 +0000 (16:37 +0900)]
CEC: Let <Active Source> from the active source work

<Active Source> from the device which is already in active
source state is being ignored now, but it should work with an effect
of putting input view foreground in case it is hidden behind
home launcher overlay.

For better user experience, this change lets the command from
the active source takes effect to hide the overlay if present.

Bug: 19171319
Change-Id: I43d2646f2ad470b3636e82ff71ac83cf0031ef6c

9 years agoam c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Wed, 28 Jan 2015 04:14:54 +0000 (04:14 +0000)]
am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
automerge: 5421eee

* commit '5421eee195265d05c821814501aae1bf3f468661':
  docs: plugin for gradle typo

9 years agoam cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am...
Leon Scroggins III [Wed, 28 Jan 2015 04:13:25 +0000 (04:13 +0000)]
am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
automerge: 714b651

* commit '714b6517dcca03a1a6496b33064d54a6b781914a':
  Handle bad ninepatch data.

9 years agoMerge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev
Christopher Tate [Wed, 28 Jan 2015 01:23:49 +0000 (01:23 +0000)]
Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev

9 years agoMerge "Fix 'always' preferred app assignment" into lmp-mr1-dev
Christopher Tate [Wed, 28 Jan 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev

9 years agoEnforce backup encryption in the UI, not just in effect
Christopher Tate [Tue, 27 Jan 2015 23:33:40 +0000 (15:33 -0800)]
Enforce backup encryption in the UI, not just in effect

Encryption is required when using 'adb backup' on encrypted devices,
but the UI has not been enforcing this.  The failure mode is quite
confusing: the user can tap "back up my data" with no encryption
phrase supplied, and the confirmation activity disappears, but
the backup doesn't actually happen.

We now disallow confirming the backup unless a non-empty passphrase
has been entered into the UI.

In addition, tapping "do not back up my data" now finishes
the confirmation activity instead of just leaving it in a
confusing "dead" state.

Bug 19081192

Change-Id: I9ca69a08ff4322fe25129f9ca880b066c31525d0

9 years agoam c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 23:09:12 +0000 (23:09 +0000)]
am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs

* commit 'c6326f44bf0634f58a7bf6f322b4b676352baeed':
  docs: plugin for gradle typo

9 years agoam 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 23:03:49 +0000 (23:03 +0000)]
am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs

* commit '05defb992eefb8a32742d64c06e8e8fd02dbf670':
  docs: plugin for gradle typo

9 years agoam cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am...
Leon Scroggins III [Tue, 27 Jan 2015 23:02:57 +0000 (23:02 +0000)]
am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit 'cae216f8dc3e1d752f2c353e488da07cadd95570':
  Handle bad ninepatch data.

9 years agoMerge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 22:57:29 +0000 (22:57 +0000)]
Merge "docs: plugin for gradle typo" into lmp-docs

9 years agoam 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle...
Leon Scroggins III [Tue, 27 Jan 2015 22:55:00 +0000 (22:55 +0000)]
am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Tue, 27 Jan 2015 22:48:29 +0000 (22:48 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '1dbbc2045ae16a4923b30c9576703d02a4363529':
  Handle bad ninepatch data.

9 years agoam 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:42:03 +0000 (22:42 +0000)]
am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '6106f6a490cb5816602e8e3ae84a5c653dda44d3':
  Handle bad ninepatch data.

9 years agoam 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:31:47 +0000 (22:31 +0000)]
am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '9352296810926eae663477526545a55e1b1f7a27':
  Handle bad ninepatch data.

9 years agoam 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:17:11 +0000 (22:17 +0000)]
am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.

9 years agoMerge "Add a config for whether to start in touch mode." into lmp-mr1-dev
Tim Kilbourn [Tue, 27 Jan 2015 22:03:49 +0000 (22:03 +0000)]
Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev

9 years agoam 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:01:08 +0000 (22:01 +0000)]
am 9a6143fa: Handle bad ninepatch data.

* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.

9 years agoMerge "Use consistent logic for data icon overlays." into lmp-mr1-dev
Jeff Davidson [Tue, 27 Jan 2015 21:57:05 +0000 (21:57 +0000)]
Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev

9 years agoFix 'always' preferred app assignment
Christopher Tate [Tue, 27 Jan 2015 21:47:51 +0000 (13:47 -0800)]
Fix 'always' preferred app assignment

In the case when some possible resolutions of a given intent are at
different priorities (typically when they're intended as fallbacks when
no "normal" handler for the intent exists) the check for "is this the
same set of possible handlers that we saw last time?" was broken.  We
now ignore resolver priority entirely in that check: match set comparison
should be orthogonal to prioritization within the set, and indeed the
priority is dealt with separately in any event.

Bug 19011225

Change-Id: I3c1658442cc88b1f4a5c5f2fe9f64472799e156c

9 years agoAdd a config for whether to start in touch mode.
Tim Kilbourn [Wed, 21 Jan 2015 23:43:07 +0000 (15:43 -0800)]
Add a config for whether to start in touch mode.

Bug: 18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d

9 years agoam f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:28:14 +0000 (21:28 +0000)]
am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.

* commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad':
  docs: Transitions training class.

9 years agoam 8ec3eb4e: am de113066: docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:23:19 +0000 (21:23 +0000)]
am 8ec3eb4e: am de113066: docs: Transitions training class.

* commit '8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
  docs: Transitions training class.

9 years agoam de113066: docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:16:53 +0000 (21:16 +0000)]
am de113066: docs: Transitions training class.

* commit 'de113066d80c3f19979eb531484af73f64640de9':
  docs: Transitions training class.

9 years agoMerge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
Craig Mautner [Tue, 27 Jan 2015 20:48:55 +0000 (20:48 +0000)]
Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev

9 years agoDefer tap outside stack until multiwindows
Craig Mautner [Tue, 27 Jan 2015 19:44:59 +0000 (11:44 -0800)]
Defer tap outside stack until multiwindows

Taps outside of the stack boundary were causing the current app to
lose focus. This led to timeouts waiting for the app to respond.

Disabling the tap recognition keeps the focus from changing. It will
be reenabled for multiwindows.

Fixes bug 17721767.

Change-Id: Iad854b19979390e73b97239e489ad7ef82e03d47

9 years agodocs: Transitions training class.
Ricardo Cervera [Mon, 12 Jan 2015 20:45:54 +0000 (12:45 -0800)]
docs: Transitions training class.

Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591

9 years agoHandle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.

Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit a730ef3f77fc495bc90199b4d45efab26d609782)

9 years agoMerge "Handle bad ninepatch data." into lmp-mr1-dev
Leon Scroggins III [Tue, 27 Jan 2015 18:22:41 +0000 (18:22 +0000)]
Merge "Handle bad ninepatch data." into lmp-mr1-dev

9 years agoMerge "Delay the second message for 30ms more than the last message for a2dp" into...
Matthew Xie [Tue, 27 Jan 2015 18:13:39 +0000 (18:13 +0000)]
Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev

9 years agoHandle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.

Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2

9 years agoMerge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
George Mount [Tue, 27 Jan 2015 15:13:29 +0000 (15:13 +0000)]
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev

9 years agoMerge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
Lorenzo Colitti [Tue, 27 Jan 2015 11:41:08 +0000 (11:41 +0000)]
Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev

9 years agoMerge "Add a missing file to print spooler resources" into lmp-mr1-dev
Svetoslav [Tue, 27 Jan 2015 04:24:07 +0000 (04:24 +0000)]
Merge "Add a missing file to print spooler resources" into lmp-mr1-dev

9 years agoMerge "Accessibility: Ignore overlapping siblings when computing a click location...
Svetoslav [Tue, 27 Jan 2015 04:23:43 +0000 (04:23 +0000)]
Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev

9 years agoMerge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
Jose Lima [Tue, 27 Jan 2015 02:53:21 +0000 (02:53 +0000)]
Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev

9 years agoUse consistent logic for data icon overlays.
Jeff Davidson [Tue, 27 Jan 2015 02:23:24 +0000 (18:23 -0800)]
Use consistent logic for data icon overlays.

Ensure that we always show the data icon in both Quick Settings and
the status bar, or in neither, but never one or the other.

The particular inconsistency this is intended to fix is that in some
circumstances, Wi-Fi may be connected, but the cell radio may be still
be used by certain apps, due to new multinetworking APIs in L. In this
case, we should always show the data icon; currently appears in the
status bar, but not Quick Settings, which was unconditionally dropping
the icon if any Wi-Fi connection was up.

Bug: 19112322
Change-Id: I9942f6b24081e061a72804ef47ad4fe719f32ec2

9 years agoAllow disabling the Options Pannel feature for TVs
Jose Lima [Sat, 24 Jan 2015 01:24:22 +0000 (17:24 -0800)]
Allow disabling the Options Pannel feature for TVs

- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.

Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6

9 years agoMerge "Stop logging service starts and stops." into lmp-mr1-dev
Craig Mautner [Tue, 27 Jan 2015 01:15:34 +0000 (01:15 +0000)]
Merge "Stop logging service starts and stops." into lmp-mr1-dev

9 years agoMerge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
Wonsik Kim [Tue, 27 Jan 2015 01:12:32 +0000 (01:12 +0000)]
Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev

9 years agoMerge "Invalidate outline on padding update" into lmp-mr1-dev
Chris Craik [Tue, 27 Jan 2015 01:08:53 +0000 (01:08 +0000)]
Merge "Invalidate outline on padding update" into lmp-mr1-dev

9 years agoTIF: fix loud volume after input switch when volume is 0
Wonsik Kim [Mon, 26 Jan 2015 08:28:55 +0000 (17:28 +0900)]
TIF: fix loud volume after input switch when volume is 0

Bug: 19134440
Change-Id: I6291f299a27315e79b505ea36bf96c79437e6b53

9 years agoMerge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
Alan Viverette [Tue, 27 Jan 2015 01:01:55 +0000 (01:01 +0000)]
Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev

9 years agoActivity Transition: fix quick back after enter.
George Mount [Mon, 26 Jan 2015 22:38:19 +0000 (14:38 -0800)]
Activity Transition: fix quick back after enter.

Bug 19105460

When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.

Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da

9 years agoDefault "pickup peforms proximity check" to false.
John Spurlock [Mon, 26 Jan 2015 23:55:29 +0000 (18:55 -0500)]
Default "pickup peforms proximity check" to false.

Don't assume the pickup sensor will perform a proximity check before
starting to pulse.  This will add some latency, but necessary if
we can't trust the sensor.

Bug: 19083596
Change-Id: I51b7daf5ed76b2780ec5c949a75cc1fca247ddad

9 years agoConvert getHourForDegrees result to 12-hour format when needed
Alan Viverette [Mon, 26 Jan 2015 23:34:56 +0000 (15:34 -0800)]
Convert getHourForDegrees result to 12-hour format when needed

Also prevents the selector from jumping between the inner and outer
circle during touch exploration in 24-hour mode.

Bug: 19101918
Change-Id: If342056b378927397f8651dad5e8d806bcda03a6

9 years agoInvalidate outline on padding update
Chris Craik [Mon, 26 Jan 2015 22:39:11 +0000 (14:39 -0800)]
Invalidate outline on padding update

bug:19113359

Ensures that ViewOutlineProvider#PADDED_BOUNDS is always kept up to
date with the view's padding.

Change-Id: I5e090bd8272e89d6b8b9055dbe95ef3d45333fcb

9 years agoStop logging service starts and stops.
Craig Mautner [Mon, 26 Jan 2015 22:33:39 +0000 (14:33 -0800)]
Stop logging service starts and stops.

Completes work on bug 18201239.

Change-Id: I80686351ac91e48bf113976a000b351b423d8dd2

9 years agoMerge "Only try to fetch time from NTP if there is a network connection." into lmp...
Lorenzo Colitti [Mon, 26 Jan 2015 22:08:16 +0000 (22:08 +0000)]
Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev

9 years agoMerge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
Yorke Lee [Mon, 26 Jan 2015 21:47:55 +0000 (21:47 +0000)]
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev

9 years agoUpdate system-api for new getLine1Number() method.
Nancy Chen [Mon, 26 Jan 2015 20:35:35 +0000 (12:35 -0800)]
Update system-api for new getLine1Number() method.

Add new method in TelecomManager to system-current.txt.

Bug: 19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273

9 years agoam 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to...
Sarah Maddox [Mon, 26 Jan 2015 20:35:06 +0000 (20:35 +0000)]
am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs

* commit '83f40802148e922d78222ffc56377534b8ee92be':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.

9 years agoam 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API...
Sarah Maddox [Mon, 26 Jan 2015 20:30:14 +0000 (20:30 +0000)]
am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs

* commit '95226c981b4e14a900f7c4224534d370aeb1ca60':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.

9 years agoam 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses...
Sarah Maddox [Mon, 26 Jan 2015 20:23:25 +0000 (20:23 +0000)]
am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs

* commit '912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.

9 years agoMerge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient...
Sarah Maddox [Mon, 26 Jan 2015 20:12:21 +0000 (20:12 +0000)]
Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs

9 years agoMerge "Add reason string for bringing stack to front" into lmp-mr1-dev
Craig Mautner [Mon, 26 Jan 2015 20:05:44 +0000 (20:05 +0000)]
Merge "Add reason string for bringing stack to front" into lmp-mr1-dev

9 years agoam df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvemen...
Ricardo Cervera [Mon, 26 Jan 2015 19:51:53 +0000 (19:51 +0000)]
am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs

* commit 'df07000e356dee84de9f4dcdd22a15e26e32f684':
  docs: Wear DataItem listener improvements

9 years agoam d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into...
Ricardo Cervera [Mon, 26 Jan 2015 19:45:33 +0000 (19:45 +0000)]
am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs

* commit 'd064ce7e8b4ef75c07b99d466c85ea55ef2f4163':
  docs: Wear DataItem listener improvements

9 years agoMerge "Add method in TelecomManager to return line1Number for a PhoneAccount." into...
Nancy Chen [Mon, 26 Jan 2015 19:44:53 +0000 (19:44 +0000)]
Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev

9 years agoam edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
Ricardo Cervera [Mon, 26 Jan 2015 19:39:48 +0000 (19:39 +0000)]
am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs

* commit 'edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
  docs: Wear DataItem listener improvements

9 years agoMerge "docs: Wear DataItem listener improvements" into lmp-docs
Ricardo Cervera [Mon, 26 Jan 2015 19:32:12 +0000 (19:32 +0000)]
Merge "docs: Wear DataItem listener improvements" into lmp-docs

9 years agoMerge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp...
Alan Viverette [Mon, 26 Jan 2015 19:16:39 +0000 (19:16 +0000)]
Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev

9 years agodocs: Adds new geocoding sample to Location API training.
Sarah Maddox [Sun, 30 Nov 2014 22:08:26 +0000 (09:08 +1100)]
docs: Adds new geocoding sample to Location API training.
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.

Bug: 17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6

9 years agoAdd reason string for bringing stack to front
Craig Mautner [Mon, 26 Jan 2015 17:47:33 +0000 (09:47 -0800)]
Add reason string for bringing stack to front

Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.

For bug 17721767.

Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300

9 years agoMerge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp...
Mike Lockwood [Mon, 26 Jan 2015 18:52:38 +0000 (18:52 +0000)]
Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev

9 years agoPrevent drag-to-open from cycling pressed state, propagate hotspot
Alan Viverette [Mon, 26 Jan 2015 18:24:08 +0000 (10:24 -0800)]
Prevent drag-to-open from cycling pressed state, propagate hotspot

Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.

Bug: 19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a

9 years agoMake THEATER_MODE_ON setting a system api.
Bryce Lee [Mon, 26 Jan 2015 16:21:10 +0000 (08:21 -0800)]
Make THEATER_MODE_ON setting a system api.

This will allow an unbundled home to continue accessing this property.

Bug: 19043538
Change-Id: I845a8726e617ca7b6f7f7347a0ac5aa0620d6658

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 14:16:38 +0000 (08:16 -0600)]
Import translations. DO NOT MERGE

Change-Id: If6bad1c33638d232a6f320637ac0e13c8a67adfb
Auto-generated-cl: translation import

9 years agoMerge "Update badge assets" into lmp-mr1-dev
Alexandra Gherghina [Mon, 26 Jan 2015 11:59:20 +0000 (11:59 +0000)]
Merge "Update badge assets" into lmp-mr1-dev

9 years agoMerge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev
Benjamin Franz [Mon, 26 Jan 2015 10:49:47 +0000 (10:49 +0000)]
Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev

9 years agoUpdate badge assets
Alexandra Gherghina [Mon, 26 Jan 2015 09:36:48 +0000 (09:36 +0000)]
Update badge assets

Bug: 18829152
Change-Id: I26936dc528b8d56e37eb02fa04177ad3f225b007

9 years agoMerge "Ensure notifications are sent when locking/unlocking location share" into...
Zoltan Szatmary-Ban [Mon, 26 Jan 2015 10:36:12 +0000 (10:36 +0000)]
Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev

9 years agoMake NetworkMonitor less aggressive on broken networks.
Lorenzo Colitti [Thu, 22 Jan 2015 13:36:50 +0000 (22:36 +0900)]
Make NetworkMonitor less aggressive on broken networks.

1. Retry validation 3 times instead of 10.

Reducing the number of retries speeds up dead network detection
and saves battery on networks that are don't have Internet access
(or block our connectivity checks).

Retrying 10 times is overkill. Each attempt sends 5-10 DNS
requests, waits 10 seconds to transfer only 3 or 4 packets, and
can last up to tens of seconds. Also, in MR1 we now retry every
10 minutes.

2. Make periodic revalidation only try once.

When validating periodically to see if a non-working connection
is working again, only make one attempt every 10 minutes, not
three.

3. Rename "retries" to "attempts" to make things a bit clearer.

Bug: 18922569
Bug: 18869302
Change-Id: I5f70b420c4f1bac0c33bb9ab6afb322902cdac4b

9 years agoOnly try to fetch time from NTP if there is a network connection.
Lorenzo Colitti [Thu, 22 Jan 2015 13:35:33 +0000 (22:35 +0900)]
Only try to fetch time from NTP if there is a network connection.

Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7