OSDN Git Service

android-x86/frameworks-base.git
9 years agoam b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
Eric Gilmore [Thu, 2 Apr 2015 00:59:34 +0000 (00:59 +0000)]
am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs

* commit 'b2b93762b8165ee47f49765816fc7ba0428c371c':
  Changing wording to reflect c2dm shutdown.

9 years agoMerge "Changing wording to reflect c2dm shutdown." into lmp-docs
Eric Gilmore [Wed, 1 Apr 2015 23:13:25 +0000 (23:13 +0000)]
Merge "Changing wording to reflect c2dm shutdown." into lmp-docs

9 years agoam 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
Scott Rowe [Wed, 1 Apr 2015 21:25:53 +0000 (21:25 +0000)]
am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs

* commit '4fc3d3ff404c777e07616b704c68176d9060c4e4':
  docs: Building Live TV Apps

9 years agoMerge "docs: Building Live TV Apps" into lmp-docs
Scott Rowe [Wed, 1 Apr 2015 21:05:41 +0000 (21:05 +0000)]
Merge "docs: Building Live TV Apps" into lmp-docs

9 years agoam d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering...
Luan Nguyen [Wed, 1 Apr 2015 19:43:57 +0000 (19:43 +0000)]
am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs

* commit 'd01ada25155ed82644b9cc23313c04d3f1a5721a':
  docs: Update ambient mode to mention disabling bitmap filtering

9 years agoam 649d839b: Merge "docs: Remove misleading information about hardware layer performa...
Luan Nguyen [Wed, 1 Apr 2015 19:43:54 +0000 (19:43 +0000)]
am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs

* commit '649d839b82a8fafc99ae79ba1ad5fc12218391cb':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.

9 years agoam 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
Luan Nguyen [Wed, 1 Apr 2015 19:43:39 +0000 (19:43 +0000)]
am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs

* commit '7542c44ee45a195404eccf50a82df7903e2ecd9c':
  docs: Add voice intent for starting a stopwatch

9 years agoMerge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp...
Luan Nguyen [Wed, 1 Apr 2015 19:24:29 +0000 (19:24 +0000)]
Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs

9 years agoMerge "docs: Remove misleading information about hardware layer performance benefits...
Luan Nguyen [Wed, 1 Apr 2015 19:23:20 +0000 (19:23 +0000)]
Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs

9 years agoMerge "docs: Add voice intent for starting a stopwatch" into lmp-docs
Luan Nguyen [Wed, 1 Apr 2015 19:21:39 +0000 (19:21 +0000)]
Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs

9 years agodocs: Building Live TV Apps
Scott Rowe [Thu, 5 Feb 2015 19:46:10 +0000 (11:46 -0800)]
docs: Building Live TV Apps

Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf

9 years agoam b2255d4f: docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:11:01 +0000 (18:11 +0000)]
am b2255d4f: docs: Fixed a typo.

* commit 'b2255d4f10230b51de373528aaee7b12cc9e2f2b':
  docs: Fixed a typo.

9 years agodocs: Add voice intent for starting a stopwatch
Luan Nguyen [Tue, 31 Mar 2015 19:32:53 +0000 (12:32 -0700)]
docs: Add voice intent for starting a stopwatch

bug: 19931486
Change-Id: I9895966da1203e1f95ac29a61f9613548b8f2177

9 years agodocs: Remove misleading information about hardware layer performance
Luan Nguyen [Fri, 13 Feb 2015 19:07:44 +0000 (11:07 -0800)]
docs: Remove misleading information about hardware layer performance
benefits for optimizing views.

bug: 18356775
Change-Id: Ideac15f1eb42fe4c2e291800458bf739cd6a9b4a

9 years agodocs: Fixed a typo.
Andrew Solovay [Tue, 31 Mar 2015 19:10:47 +0000 (12:10 -0700)]
docs: Fixed a typo.

See first comment for doc stage location.

bug: 19709151
Change-Id: I182cb76c55acd32da921420b3ef37d330cf63bb0

9 years agoam 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
Svetoslav [Tue, 31 Mar 2015 16:33:21 +0000 (16:33 +0000)]
am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE

* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE

9 years agoAccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
Svetoslav [Thu, 29 Jan 2015 00:44:02 +0000 (16:44 -0800)]
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE

AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.

bug:16954787

Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit 5738fec00db65e0ee246475a7236e57ba3ee8d55)

9 years agoam f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
Rich Slogar [Mon, 30 Mar 2015 21:30:39 +0000 (21:30 +0000)]
am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev

* commit 'f80370c60118441c0022333a5b4f8cda99c86774':
  docs: build tools 22.0.1 revision updates

9 years agoMerge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
Rich Slogar [Mon, 30 Mar 2015 21:24:19 +0000 (21:24 +0000)]
Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev

9 years agodocs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 11 Mar 2015 16:36:08 +0000 (09:36 -0700)]
docs: Update ambient mode to mention disabling bitmap filtering

bug: 19429396
Change-Id: I51c1c58211cbdcb8c293b693627c659fd55537cf

9 years agoam 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough...
Bart Sears [Fri, 27 Mar 2015 21:14:37 +0000 (21:14 +0000)]
am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev

* commit '4a26c391d08dfa6a3c189293f0fc163b817b1b49':
  CEC: Explicitly turn on screen for remote control passthrough

9 years agoMerge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
Bart Sears [Fri, 27 Mar 2015 20:48:37 +0000 (20:48 +0000)]
Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev

9 years agoam 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 02:49:27 +0000 (02:49 +0000)]
am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.

* commit '4e6ae02a29dd432648a81f3803f3ccf712621d43':
  Fix tests for Java 6.

9 years agoam dbe0dd16: When scanning unbundled apps, only install the expected APK tree
Christopher Tate [Fri, 27 Mar 2015 02:49:23 +0000 (02:49 +0000)]
am dbe0dd16: When scanning unbundled apps, only install the expected APK tree

* commit 'dbe0dd160e93feef1335830a36e86ae83b19b793':
  When scanning unbundled apps, only install the expected APK tree

9 years agoam 17bb697b: am ec8df9af: Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:53 +0000 (01:09 +0000)]
am 17bb697b: am ec8df9af: Fix tests for Java 6.

* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.

9 years agoam ec8df9af: Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 01:02:58 +0000 (01:02 +0000)]
am ec8df9af: Fix tests for Java 6.

* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.

9 years agoam 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
Michael Runge [Fri, 27 Mar 2015 00:35:12 +0000 (00:35 +0000)]
am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA

* commit '9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
  Increase timeout when uncrypting OTA

9 years agoam 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
Amith Yamasani [Fri, 27 Mar 2015 00:35:00 +0000 (00:35 +0000)]
am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev

* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.

9 years agoam 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations."...
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:21 +0000 (00:34 +0000)]
am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev

* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.

9 years agoam dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE...
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:12 +0000 (00:34 +0000)]
am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]

9 years agoam e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:01 +0000 (00:34 +0000)]
am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.

9 years agoam 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and...
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:56 +0000 (00:33 +0000)]
am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.

9 years agoam 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:52 +0000 (00:33 +0000)]
am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev

* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.

9 years agoam 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:47 +0000 (00:33 +0000)]
am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.

9 years agoam d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 27 Mar 2015 00:33:21 +0000 (00:33 +0000)]
am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.

9 years agoWhen scanning unbundled apps, only install the expected APK tree
Christopher Tate [Thu, 26 Mar 2015 22:38:29 +0000 (15:38 -0700)]
When scanning unbundled apps, only install the expected APK tree

We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state.  When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.

Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.

Bug 19602471

Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74

9 years agoFix tests for Java 6.
Deepanshu Gupta [Thu, 26 Mar 2015 18:08:43 +0000 (11:08 -0700)]
Fix tests for Java 6.

 - Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f

9 years agoam 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 04:08:24 +0000 (04:08 +0000)]
am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA

* commit '96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
  Increase timeout when uncrypting OTA

9 years agoam b0197033: Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 03:57:33 +0000 (03:57 +0000)]
am b0197033: Increase timeout when uncrypting OTA

* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA

9 years agoIncrease timeout when uncrypting OTA
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA

Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)

9 years agoCEC: Explicitly turn on screen for remote control passthrough
Jinsuk Kim [Tue, 24 Mar 2015 07:55:01 +0000 (16:55 +0900)]
CEC: Explicitly turn on screen for remote control passthrough

Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.

Bug: 19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit 9b8507c52ae845c8eed9fd9952bf66538934b8fd)

9 years agoMerge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
Amith Yamasani [Wed, 25 Mar 2015 22:12:44 +0000 (22:12 +0000)]
Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev

9 years agoFix NPE if FPE service does not exist.
Paul Crowley [Wed, 25 Mar 2015 11:43:42 +0000 (11:43 +0000)]
Fix NPE if FPE service does not exist.

Bug: 19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576

9 years agoam 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:18 +0000 (00:02 +0000)]
am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev

* commit '44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
  Update JRE for runConfigurations.

9 years agoam cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:06 +0000 (00:02 +0000)]
am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit 'cbb4ec78675c8179cdedafba1972ac062844c70a':
  Fix project settings. [DO NOT MERGE]

9 years agoam a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:58 +0000 (00:01 +0000)]
am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit 'a16bb347e120ba17e87f33ff0364380211d01baf':
  Fix RoundRect radius.

9 years agoam 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into...
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:53 +0000 (00:01 +0000)]
am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
  Use right colors for status bar and nav bar.

9 years agoam 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:49 +0000 (00:01 +0000)]
am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev

* commit '0b76cf6ff56c59a04783714d40163576e3081cf1':
  Better shadows.

9 years agoam a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:43 +0000 (00:01 +0000)]
am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit 'a62a18e341180ccf6f5379a7d753584f6cee2e7c':
  Fix layoutlib tests.

9 years agoam e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:18 +0000 (23:55 +0000)]
am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev

* commit 'e541f35055709ec43407649b8517639ff00e42d6':
  Update JRE for runConfigurations.

9 years agoam 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:14 +0000 (23:55 +0000)]
am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit '6f5fac817abee63d9211e8e43646196950c43707':
  Fix project settings. [DO NOT MERGE]

9 years agoam 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:10 +0000 (23:55 +0000)]
am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit '44fea60376e4e851b07eb365fd581c5b9404611f':
  Fix RoundRect radius.

9 years agoam 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:06 +0000 (23:55 +0000)]
am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
  Use right colors for status bar and nav bar.

9 years agoam 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:02 +0000 (23:55 +0000)]
am 34751c79: Merge "Better shadows." into lmp-dev

* commit '34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
  Better shadows.

9 years agoam 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:54:58 +0000 (23:54 +0000)]
am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.

9 years agoMerge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:28 +0000 (23:52 +0000)]
Merge "Update JRE for runConfigurations." into lmp-dev

9 years agoMerge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:17 +0000 (23:52 +0000)]
Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

9 years agoMerge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:48 +0000 (23:51 +0000)]
Merge "Fix RoundRect radius." into lmp-dev

9 years agoMerge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:29 +0000 (23:51 +0000)]
Merge "Use right colors for status bar and nav bar." into lmp-dev

9 years agoMerge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:10 +0000 (23:51 +0000)]
Merge "Better shadows." into lmp-dev

9 years agoMerge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:50:53 +0000 (23:50 +0000)]
Merge "Fix layoutlib tests." into lmp-dev

9 years agoBetter shadows.
Deepanshu Gupta [Wed, 4 Feb 2015 03:02:15 +0000 (19:02 -0800)]
Better shadows.

Better shadows for rectangles and rounded rectangles (includes circles).

The shadow painting code is mostly from CardView library, but modified
heavily since CardView needs to draw the shadow inside view bounds.

Change-Id: I88c9f19b1c16839b8d6db6df2bebff126fa5a9a3

9 years agoFix RoundRect radius.
Deepanshu Gupta [Tue, 24 Mar 2015 18:34:34 +0000 (11:34 -0700)]
Fix RoundRect radius.

Android APIs use radius for measuring the corner's curvature, but Java2D
APIs use diameter. Add the missing conversion.

Change-Id: I630fc8712e8301324c641885c0c4adf644d13b7e

9 years agoChanging wording to reflect c2dm shutdown.
Eric Gilmore [Tue, 24 Mar 2015 18:26:31 +0000 (11:26 -0700)]
Changing wording to reflect c2dm shutdown.

Change-Id: If8b6c05e10dfe39e1cada48fc5270931a7f94cd4

9 years agoUse right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 18 Mar 2015 22:47:54 +0000 (15:47 -0700)]
Use right colors for status bar and nav bar.

Bug: http://b.android.com/81862
Change-Id: Ia10297e83e54c01a50de6cbcac2b7fef48e8d238

9 years agoMerge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 20 Mar 2015 22:05:06 +0000 (22:05 +0000)]
Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

9 years agoDisable more hotkeys while in setup.
Jeff Brown [Fri, 20 Mar 2015 01:26:30 +0000 (18:26 -0700)]
Disable more hotkeys while in setup.

Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0

9 years agodocs: build tools 22.0.1 revision updates
Rich Slogar [Thu, 19 Mar 2015 01:09:28 +0000 (18:09 -0700)]
docs: build tools 22.0.1 revision updates

Change-Id: I47f9a6036f0ee06e7f13cbd7ba48a481a2bb555f

9 years agoam 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into...
Zach Riggle [Thu, 19 Mar 2015 23:29:06 +0000 (23:29 +0000)]
am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController

9 years agoam a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:22:10 +0000 (23:22 +0000)]
am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController

9 years agoam 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:15:02 +0000 (23:15 +0000)]
am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController

9 years agoMerge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:09:31 +0000 (23:09 +0000)]
Merge "Fix NPE in FlashlightController" into lmp-dev

9 years agoam d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the...
smain@google.com [Thu, 19 Mar 2015 22:42:44 +0000 (22:42 +0000)]
am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page

9 years agoam 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature...
smain@google.com [Thu, 19 Mar 2015 22:35:16 +0000 (22:35 +0000)]
am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page

9 years agoam 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into...
smain@google.com [Thu, 19 Mar 2015 22:29:09 +0000 (22:29 +0000)]
am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page

9 years agoam 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:22:10 +0000 (22:22 +0000)]
am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page

9 years agoMerge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:16:11 +0000 (22:16 +0000)]
Merge "add Places API to the Location feature page" into lmp-docs

9 years agoam bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change...
Joe Fernandez [Thu, 19 Mar 2015 20:42:36 +0000 (20:42 +0000)]
am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated...
Joe Fernandez [Thu, 19 Mar 2015 20:42:30 +0000 (20:42 +0000)]
am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added...
Joe Fernandez [Thu, 19 Mar 2015 20:42:23 +0000 (20:42 +0000)]
am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for...
Joe Fernandez [Thu, 19 Mar 2015 20:35:09 +0000 (20:35 +0000)]
am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s...
Joe Fernandez [Thu, 19 Mar 2015 20:35:05 +0000 (20:35 +0000)]
am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'f761e4c20ee63873043522990487ecd15bb18966':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javado...
Joe Fernandez [Thu, 19 Mar 2015 20:34:59 +0000 (20:34 +0000)]
am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre...
Eric Gilmore [Thu, 19 Mar 2015 20:32:03 +0000 (20:32 +0000)]
am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
  Changes for a quick, pre-migration bug sprint:

9 years agoam c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API...
Joe Fernandez [Thu, 19 Mar 2015 20:28:54 +0000 (20:28 +0000)]
am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google...
Joe Fernandez [Thu, 19 Mar 2015 20:28:45 +0000 (20:28 +0000)]
am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'd91167e8ceda64809e9afd73ac184dc319a276f5':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google...
Joe Fernandez [Thu, 19 Mar 2015 20:28:40 +0000 (20:28 +0000)]
am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration...
Eric Gilmore [Thu, 19 Mar 2015 20:24:57 +0000 (20:24 +0000)]
am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
  Changes for a quick, pre-migration bug sprint:

9 years agoam dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp...
Joe Fernandez [Thu, 19 Mar 2015 20:21:47 +0000 (20:21 +0000)]
am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 20:21:43 +0000 (20:21 +0000)]
am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play service...
Joe Fernandez [Thu, 19 Mar 2015 20:21:37 +0000 (20:21 +0000)]
am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:"...
Eric Gilmore [Thu, 19 Mar 2015 20:17:22 +0000 (20:17 +0000)]
am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 20:16:31 +0000 (20:16 +0000)]
Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect...
Joe Fernandez [Thu, 19 Mar 2015 20:16:20 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla...
Joe Fernandez [Thu, 19 Mar 2015 20:16:03 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

9 years agoam e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:10:55 +0000 (20:10 +0000)]
am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit 'e43a64e3336548094571885944afc28792e24fa0':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:05:49 +0000 (20:05 +0000)]
Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

9 years agoam 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update...
Rich Slogar [Thu, 19 Mar 2015 19:54:30 +0000 (19:54 +0000)]
am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit '983dd1a9d1dc5a6d0bc72fcbc87b5194df09c048':
  docs: proguard help update

9 years agoam b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp...
Rich Slogar [Thu, 19 Mar 2015 19:47:03 +0000 (19:47 +0000)]
am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'b569ec3cc1366e3e3caa96fa40a9fc14ed9c6121':
  docs: proguard help update

9 years agoam d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:39:27 +0000 (19:39 +0000)]
am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'd76aa14cf401ca794b585b2312528121c651a537':
  docs: proguard help update