OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Prevent draw passes when nothing actually changes" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 21:17:54 +0000 (21:17 +0000)]
Merge "Prevent draw passes when nothing actually changes" into mnc-dev

9 years agoPrevent draw passes when nothing actually changes
Jorim Jaggi [Thu, 21 May 2015 00:05:23 +0000 (17:05 -0700)]
Prevent draw passes when nothing actually changes

Bug: 19602257
Change-Id: I1d05fb8399332021b6d50470fe3dd9bb34773a81

9 years agoMerge "Round rect clipping for notification contents" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 21:14:44 +0000 (21:14 +0000)]
Merge "Round rect clipping for notification contents" into mnc-dev

9 years agoRound rect clipping for notification contents
Jorim Jaggi [Thu, 21 May 2015 03:04:08 +0000 (20:04 -0700)]
Round rect clipping for notification contents

Enable round rect clipping on notifications for the following kind
of notifications:
- Big picture style.
- Big media narrow style.
- Custom notifications.

Bug: 16142505
Change-Id: I157650fe470636ed624a81557c08135827eac0cb

9 years agoam 97c0c444: am 4ec5140b: Merge "docs: Update the auto checklist and cleanup supporti...
Luan Nguyen [Tue, 26 May 2015 20:57:30 +0000 (20:57 +0000)]
am 97c0c444: am 4ec5140b: Merge "docs: Update the auto checklist and cleanup supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification." into mnc-preview-docs

* commit '97c0c444db850c7d5381c8708a235050a45ce1ad':
  docs: Update the auto checklist and cleanup supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification.

9 years agoam 597788c6: am 9510d046: Merge "docs: Add Voice Actions section to Audio training...
Luan Nguyen [Tue, 26 May 2015 20:57:23 +0000 (20:57 +0000)]
am 597788c6: am 9510d046: Merge "docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample." into mnc-preview-docs

* commit '597788c6f0ee484b263346544a155898579d8206':
  docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample.

9 years agoam 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc...
Andrew Solovay [Tue, 26 May 2015 20:57:17 +0000 (20:57 +0000)]
am 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

* commit '28942bbe21f188ac7da502454337ceea7c6323a9':
  docs: M Runtime Permissions overview.

9 years agoMerge "Don't leak starting window when app crashes before adding windows" into mnc-dev
Wale Ogunwale [Tue, 26 May 2015 20:56:46 +0000 (20:56 +0000)]
Merge "Don't leak starting window when app crashes before adding windows" into mnc-dev

9 years agoMerge "Add vvm type for t-mobile." into mnc-dev
Nancy Chen [Tue, 26 May 2015 20:54:26 +0000 (20:54 +0000)]
Merge "Add vvm type for t-mobile." into mnc-dev

9 years agoMerge "Add fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 20:50:46 +0000 (20:50 +0000)]
Merge "Add fingerprint icon" into mnc-dev

9 years agoAdd fingerprint icon
Jorim Jaggi [Wed, 20 May 2015 02:47:11 +0000 (19:47 -0700)]
Add fingerprint icon

Bug: 20663748
Change-Id: Iae9512173f7ea9d3d62a53cded29d23140bdcfd8

9 years agoMerge "Polish animations for fingerprint icon" into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 20:48:38 +0000 (20:48 +0000)]
Merge "Polish animations for fingerprint icon" into mnc-dev

9 years agoam 4ec5140b: Merge "docs: Update the auto checklist and cleanup supporting docs that...
Luan Nguyen [Tue, 26 May 2015 20:44:23 +0000 (20:44 +0000)]
am 4ec5140b: Merge "docs: Update the auto checklist and cleanup supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification." into mnc-preview-docs

* commit '4ec5140be35df2e9c49558d330df06fa985f7bc9':
  docs: Update the auto checklist and cleanup supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification.

9 years agoam 9510d046: Merge "docs: Add Voice Actions section to Audio training lesson. Add...
Luan Nguyen [Tue, 26 May 2015 20:44:12 +0000 (20:44 +0000)]
am 9510d046: Merge "docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample." into mnc-preview-docs

* commit '9510d0464f1e33c8a9adf5dde7f1a503a0f20b0b':
  docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample.

9 years agoam 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs
Andrew Solovay [Tue, 26 May 2015 20:44:00 +0000 (20:44 +0000)]
am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

* commit '99f4bdf5ff90fe17512d4a77142f254a489bccc2':
  docs: M Runtime Permissions overview.

9 years agoMerge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
Nicolas Prevot [Tue, 26 May 2015 20:39:27 +0000 (20:39 +0000)]
Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev

9 years agoMerge "docs: Update the auto checklist and cleanup supporting docs that checklist...
Luan Nguyen [Tue, 26 May 2015 20:37:02 +0000 (20:37 +0000)]
Merge "docs: Update the auto checklist and cleanup supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification." into mnc-preview-docs

9 years agoam 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior Changes docs...
Quddus Chong [Tue, 26 May 2015 20:37:00 +0000 (20:37 +0000)]
am 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

* commit '125dbf895db097cd83cbeedc81571060f3f40099':
  docs: Add API Overview and Behavior Changes docs for M Developer Preview.

9 years agoMerge "docs: Add Voice Actions section to Audio training lesson. Add link for Univers...
Luan Nguyen [Tue, 26 May 2015 20:36:44 +0000 (20:36 +0000)]
Merge "docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample." into mnc-preview-docs

9 years agoPolish animations for fingerprint icon
Jorim Jaggi [Wed, 20 May 2015 21:13:23 +0000 (14:13 -0700)]
Polish animations for fingerprint icon

- Make error state animation faster.
- Add animation for
-- Draw on when turning on the screen
-- Draw off when unlocking
-- Error state -> normal state

Bug: 21269675
Change-Id: If09c0a35ce194fbeeb86151d45b4cfa81c9999c5

9 years agoMerge "docs: M Runtime Permissions overview." into mnc-preview-docs
Andrew Solovay [Tue, 26 May 2015 20:30:41 +0000 (20:30 +0000)]
Merge "docs: M Runtime Permissions overview." into mnc-preview-docs

9 years agoam d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer...
Quddus Chong [Tue, 26 May 2015 20:23:22 +0000 (20:23 +0000)]
am d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

* commit 'd313958f8ed099b90bbd3580580f4e37e9bf3c81':
  docs: Add API Overview and Behavior Changes docs for M Developer Preview.

9 years agoam ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc...
Joe Fernandez [Tue, 26 May 2015 20:22:00 +0000 (20:22 +0000)]
am ec5aa0e1: am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit 'ec5aa0e183011d0243219f760250b917d7a24c63':
  docs: M Preview - Performance Testing

9 years agoMerge "docs: Add API Overview and Behavior Changes docs for M Developer Preview....
Quddus Chong [Tue, 26 May 2015 20:13:34 +0000 (20:13 +0000)]
Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs

9 years agodocs: Add API Overview and Behavior Changes docs for M Developer Preview.
Quddus Chong [Sun, 10 May 2015 23:07:27 +0000 (16:07 -0700)]
docs: Add API Overview and Behavior Changes docs for M Developer Preview.

Change-Id: I4aff933b60b7eac17ccfa4f5f41f26153d464418

9 years agoam 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 20:08:42 +0000 (20:08 +0000)]
am 71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

* commit '71574a995b9ac66673970b99f12a94cf84901418':
  docs: M Preview - Performance Testing

9 years agoMerge "docs: M Preview - Performance Testing" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 20:00:56 +0000 (20:00 +0000)]
Merge "docs: M Preview - Performance Testing" into mnc-preview-docs

9 years agodocs: M Preview - Performance Testing
Joe Fernandez [Sat, 23 May 2015 06:53:28 +0000 (23:53 -0700)]
docs: M Preview - Performance Testing

Change-Id: I6b23d83a198528353f60749e07d40a00c051866d

9 years agoam 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview...
Joe Fernandez [Tue, 26 May 2015 19:58:04 +0000 (19:58 +0000)]
am 37f827db: am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit '37f827db9b3a66f7f4f455011d42c84e610416d6':
  docs: M Preview Testing Guide

9 years agodocs: M Runtime Permissions overview.
Andrew Solovay [Wed, 13 May 2015 01:01:13 +0000 (18:01 -0700)]
docs: M Runtime Permissions overview.

Based on the Google Doc which has gone through tech review. See
first comment for doc stage location.

NOTE: Because the M Preview reference docs are not going to be live on
DAC (they'll be downloadable in a zip archive, I believe), we can't
put in live hyperlinks to new-for-M classes/fields/ methods. Those
have to just be in <code> font with no link. This is consistent across
all the preview docs, and will of course change when these docs are
converted for the MNC release.

bug: 21411602
bug: 21411604

Change-Id: I1163abc1dc884cf27b0e94d266f3979f131db2ab

9 years agoMerge "media: Update MediaCodec class description" into mnc-dev
Lajos Molnar [Tue, 26 May 2015 19:52:01 +0000 (19:52 +0000)]
Merge "media: Update MediaCodec class description" into mnc-dev

9 years agomedia: Update MediaCodec class description
Lajos Molnar [Fri, 22 May 2015 16:35:58 +0000 (09:35 -0700)]
media: Update MediaCodec class description

Bug: 11990465
Bug: 11019199
Bug: 11990564
Bug: 10672559
Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995

9 years agoMerge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev
John Spurlock [Tue, 26 May 2015 19:41:51 +0000 (19:41 +0000)]
Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev

9 years agoam c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 19:41:48 +0000 (19:41 +0000)]
am c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs

* commit 'c3d171bbe1c55445ff475c63203b4a8eae5e40c7':
  docs: M Preview Testing Guide

9 years agoZen: Calendar auto-rule tracks primary calendar for corp profile.
John Spurlock [Wed, 20 May 2015 13:47:13 +0000 (09:47 -0400)]
Zen: Calendar auto-rule tracks primary calendar for corp profile.

 - Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c

9 years agoMerge "docs: M Preview Testing Guide" into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 19:26:40 +0000 (19:26 +0000)]
Merge "docs: M Preview Testing Guide" into mnc-preview-docs

9 years agodocs: M Preview Testing Guide
Joe Fernandez [Thu, 21 May 2015 23:31:13 +0000 (16:31 -0700)]
docs: M Preview Testing Guide

A general overview for developers on what to test during the  M Preview

Change-Id: Idbc080482afdaf08c665e4ff2b7e62a84f9b398a

9 years agoMerge "Switch runtime permission icons to vectors" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:04:27 +0000 (19:04 +0000)]
Merge "Switch runtime permission icons to vectors" into mnc-dev

9 years agoMerge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 19:01:19 +0000 (19:01 +0000)]
Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev

9 years agoRemove temporary javadoc for android.media.AudioFormat
Jean-Michel Trivi [Tue, 26 May 2015 18:50:11 +0000 (11:50 -0700)]
Remove temporary javadoc for android.media.AudioFormat

Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.

Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d

9 years agoSwitch runtime permission icons to vectors
Jason Monk [Tue, 26 May 2015 18:33:53 +0000 (14:33 -0400)]
Switch runtime permission icons to vectors

Bug: 21367016
Change-Id: I37745eae54e977258b4ec9b184610efd94b268bb

9 years agoMerge "Support icons in the FloatingToolbar" into mnc-dev
Abodunrinwa Toki [Tue, 26 May 2015 18:26:36 +0000 (18:26 +0000)]
Merge "Support icons in the FloatingToolbar" into mnc-dev

9 years agoMerge "Remove KeyStoreParameter.getContext()." into mnc-dev
Alex Klyubin [Tue, 26 May 2015 17:57:53 +0000 (17:57 +0000)]
Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

9 years agoRemove KeyStoreParameter.getContext().
Alex Klyubin [Tue, 26 May 2015 17:40:15 +0000 (10:40 -0700)]
Remove KeyStoreParameter.getContext().

This method isn't there in the released API and we don't need it in
the new API.

Bug: 18088752
Change-Id: Iccd80715bec782ac3a12bea169df4d37264f66f9

9 years agoMerge "Add javadoc comments mentioning ConnectivityManager API permissions." into...
Paul Jensen [Tue, 26 May 2015 17:37:32 +0000 (17:37 +0000)]
Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev

9 years agoMerge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent...
Paul Jensen [Tue, 26 May 2015 17:33:24 +0000 (17:33 +0000)]
Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

9 years agoMerge "Handle error states when refreshing accessibility node" into mnc-dev
Alan Viverette [Tue, 26 May 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Handle error states when refreshing accessibility node" into mnc-dev

9 years agoMerge "Ringtone picker is not affected by current sonification policy" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 17:27:06 +0000 (17:27 +0000)]
Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

9 years agoam 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview...
Rich Slogar [Tue, 26 May 2015 17:23:48 +0000 (17:23 +0000)]
am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit '59e5d7189911fc86a65624a337a75d8f840cff3d':
  docs: support library 22.2 updates

9 years agoMerge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:19:09 +0000 (17:19 +0000)]
Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev

9 years agoMerge "Unflip TextureView getBitmap readback" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:19:01 +0000 (17:19 +0000)]
Merge "Unflip TextureView getBitmap readback" into mnc-dev

9 years agoMerge "Clarify example for Deep Share" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:15:57 +0000 (17:15 +0000)]
Merge "Clarify example for Deep Share" into mnc-dev

9 years agoSysUI: Move LocationControllerImpl receiver to bg
Jason Monk [Tue, 19 May 2015 18:21:28 +0000 (14:21 -0400)]
SysUI: Move LocationControllerImpl receiver to bg

Bug: 19520495
Change-Id: Ia0fbfb663076c296c65bcefdad62d36f98c9e757

9 years agoam a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
Rich Slogar [Tue, 26 May 2015 17:07:42 +0000 (17:07 +0000)]
am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs

* commit 'a67fa862dc6b46b7642e2abfc2df3146d8be5d98':
  docs: support library 22.2 updates

9 years agoMerge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:01:50 +0000 (17:01 +0000)]
Merge "QS: Only show summary for active wifi" into mnc-dev

9 years agoMerge "docs: support library 22.2 updates" into mnc-preview-docs
Rich Slogar [Tue, 26 May 2015 16:58:41 +0000 (16:58 +0000)]
Merge "docs: support library 22.2 updates" into mnc-preview-docs

9 years agoQS: Only show summary for active wifi
Jason Monk [Tue, 26 May 2015 16:54:12 +0000 (12:54 -0400)]
QS: Only show summary for active wifi

Bug: 20432208
Change-Id: Iedf6e4d102e64c53a633f8d377b5eb57768b1f17

9 years agodocs: Add Voice Actions section to Audio training lesson.
Luan Nguyen [Fri, 15 May 2015 22:27:17 +0000 (15:27 -0700)]
docs: Add Voice Actions section to Audio training lesson.
Add link for Universal Media Player sample.

bug: 20008284
bug: 19839477
Change-Id: I8bd0959cd41d7dde92608301c3be986339d5bf1b

9 years agoMerge "Add constants for permissions granted status api" into mnc-dev
Jason Monk [Tue, 26 May 2015 16:32:52 +0000 (16:32 +0000)]
Merge "Add constants for permissions granted status api" into mnc-dev

9 years agoMerge "Cancel voice assist session on user switch" into mnc-dev
James Cook [Tue, 26 May 2015 16:16:34 +0000 (16:16 +0000)]
Merge "Cancel voice assist session on user switch" into mnc-dev

9 years agoMerge "Update Statement Service" into mnc-dev
Joseph Wen [Tue, 26 May 2015 15:11:08 +0000 (15:11 +0000)]
Merge "Update Statement Service" into mnc-dev

9 years agoMerge "Set error code on failed keyset manifest parsing." into mnc-dev
dcashman [Tue, 26 May 2015 14:57:24 +0000 (14:57 +0000)]
Merge "Set error code on failed keyset manifest parsing." into mnc-dev

9 years agoAdd constants for permissions granted status api
Jason Monk [Fri, 22 May 2015 18:50:21 +0000 (14:50 -0400)]
Add constants for permissions granted status api

Bug: 21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb

9 years agoSpecify more information in DhcpClient PendingIntents.
Lorenzo Colitti [Tue, 26 May 2015 08:31:47 +0000 (17:31 +0900)]
Specify more information in DhcpClient PendingIntents.

- Specify the package name. This provides a bit of security, but
  not much since the package is "android".
- Specify the interface name so we can run more than one client
  at a time.

Bug: 21395858
Bug: 19704592
Change-Id: I91c9ea15285b36628b6aef0b975c16a0b08d061e

9 years agoSupport icons in the FloatingToolbar
Abodunrinwa Toki [Wed, 20 May 2015 21:25:16 +0000 (22:25 +0100)]
Support icons in the FloatingToolbar

Bug: 20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b

9 years agoMerge "Don't count lowmem mappings as memory used." into mnc-dev
Martijn Coenen [Tue, 26 May 2015 08:11:26 +0000 (08:11 +0000)]
Merge "Don't count lowmem mappings as memory used." into mnc-dev

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Tue, 26 May 2015 08:02:08 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoMerge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev
Selim Cinek [Tue, 26 May 2015 07:34:17 +0000 (07:34 +0000)]
Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev

9 years agoam 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build...
David Friedman [Tue, 26 May 2015 06:04:54 +0000 (06:04 +0000)]
am 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942.

* commit '515444ff434ff93c7b5c24bc356973f385e39adf':
  Docs: Submitting fix for build-breaking CL 695942.

9 years agoam e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters...
David Friedman [Tue, 26 May 2015 06:04:49 +0000 (06:04 +0000)]
am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

* commit 'e0f14f48416484029a478e17e6b2c5708e0e0010':
  Docs: Sample-walkthrough chapters for NDK documentation

9 years agoam a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer...
Oliver Woodman [Tue, 26 May 2015 06:04:44 +0000 (06:04 +0000)]
am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit 'a61df8f63c55d96c5443449a9fb538ad97224a52':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoam 4170d9e0: am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add...
Johan Euphrosine [Tue, 26 May 2015 06:04:38 +0000 (06:04 +0000)]
am 4170d9e0: am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit '4170d9e05b5477d75e4d8a12718e5d7b6aff3cdd':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoam db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL...
David Friedman [Tue, 26 May 2015 05:53:08 +0000 (05:53 +0000)]
am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942.

* commit 'db9274e70fcedc21d08abe340e7ef47d35258e50':
  Docs: Submitting fix for build-breaking CL 695942.

9 years agoam c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK...
David Friedman [Tue, 26 May 2015 05:53:03 +0000 (05:53 +0000)]
am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

* commit 'c25ff8e2513e78b5e22d30b6fe513fdfb2f63643':
  Docs: Sample-walkthrough chapters for NDK documentation

9 years agoam 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacin...
Oliver Woodman [Tue, 26 May 2015 05:52:59 +0000 (05:52 +0000)]
am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit '056bc731ca7a53067027b0e72f58779aaf3c558a':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoam 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css
Johan Euphrosine [Tue, 26 May 2015 05:52:54 +0000 (05:52 +0000)]
am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit '165d4585605f0fd7bcab798d9759f465ce4dca44':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoam f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 05:42:13 +0000 (05:42 +0000)]
am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942.

* commit 'f8cd49ae178a29471d1424726b23a593e9ab43a1':
  Docs: Submitting fix for build-breaking CL 695942.

9 years agoam e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
David Friedman [Tue, 26 May 2015 05:37:15 +0000 (05:37 +0000)]
am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

* commit 'e11744fefdb1678dc369a7fea5aaaf0a290fb697':
  Docs: Sample-walkthrough chapters for NDK documentation

9 years agoam 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with...
Oliver Woodman [Tue, 26 May 2015 05:37:07 +0000 (05:37 +0000)]
am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit '1ddb7caedba247aa9174fc6c78c4ea6b3b4f5a89':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoam 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css
Johan Euphrosine [Tue, 26 May 2015 05:37:01 +0000 (05:37 +0000)]
am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit '1ccbe54f2d651df7b9f9e5dfd3b58eaa2d92a9c8':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoam d580302d: Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 05:26:58 +0000 (05:26 +0000)]
am d580302d: Docs: Submitting fix for build-breaking CL 695942.

* commit 'd580302d622e4583c7ab2db8759ea8036614df6e':
  Docs: Submitting fix for build-breaking CL 695942.

9 years agoDocs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 04:53:23 +0000 (21:53 -0700)]
Docs: Submitting fix for build-breaking CL 695942.

Change-Id: Ic384cfca07f7317c07e33d584340f1678a9f99e4

9 years agoFix initial keyguard user switcher state
Adrian Roos [Tue, 26 May 2015 01:09:13 +0000 (18:09 -0700)]
Fix initial keyguard user switcher state

Bug: 18411080
Change-Id: I506968ee6101069361d83f7ef386802f5856a68e

9 years agoMerge "update app compatibility post launch detection" into mnc-dev
Guang Zhu [Mon, 25 May 2015 19:38:40 +0000 (19:38 +0000)]
Merge "update app compatibility post launch detection" into mnc-dev

9 years agoam 31a84561: am 0417dbac: Merge "Doc change: remove older diffs from static server...
Dirk Dougherty [Mon, 25 May 2015 19:32:10 +0000 (19:32 +0000)]
am 31a84561: am 0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs

* commit '31a84561ee28278ee0995c6cc27054b96372041f':
  Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.

9 years agoam 0417dbac: Merge "Doc change: remove older diffs from static server hosting. Reques...
Dirk Dougherty [Mon, 25 May 2015 19:19:50 +0000 (19:19 +0000)]
am 0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs

* commit '0417dbac1358661e2101e7ff1c9a873c59714bb9':
  Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.

9 years agoupdate app compatibility post launch detection
Guang Zhu [Mon, 25 May 2015 19:09:12 +0000 (12:09 -0700)]
update app compatibility post launch detection

decide if the app is still running after launch by checking
running tasks and look for a task with base activity belonging
to the package launched.

Change-Id: Ibb3894e765ccbca62f803decc3c1c1f36dc2d454

9 years agoMerge "Doc change: remove older diffs from static server hosting. Requests will redir...
Dirk Dougherty [Mon, 25 May 2015 19:07:23 +0000 (19:07 +0000)]
Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 18:09:36 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 18:03:26 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE

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

9 years agoAdd vvm type for t-mobile.
Nancy Chen [Sat, 23 May 2015 00:29:43 +0000 (17:29 -0700)]
Add vvm type for t-mobile.

T-Mobile has slightly different configuration details so add a vvm type
to correspond to what they use: comverse vvm.

Bug: 21126480
Change-Id: I83fd0c5651bf94eb912dd44f4b52924d8bcdd4e7

9 years agoClarify example for Deep Share
Chet Haase [Mon, 25 May 2015 15:47:36 +0000 (08:47 -0700)]
Clarify example for Deep Share

Changed name of service to avoid using the actual class name
ChooserTargetService as the example service's name.

Issue #21418354 Clarify doc example for ChooserTargetService

Change-Id: I59bf67299fe7a8307504baf5e999c14f84a1e50d

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 15:07:39 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 15:05:44 +0000 (10:05 -0500)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 14:53:44 +0000 (09:53 -0500)]
Import translations. DO NOT MERGE

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

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Mon, 25 May 2015 08:01:53 +0000 (01:01 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoam 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
David Friedman [Mon, 25 May 2015 07:00:32 +0000 (07:00 +0000)]
am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

* commit '4a6d5c9399179abcef7877c43f46855152129bd3':
  Docs: Sample-walkthrough chapters for NDK documentation

9 years agoDocs: Sample-walkthrough chapters for NDK documentation
David Friedman [Fri, 22 May 2015 09:31:51 +0000 (02:31 -0700)]
Docs: Sample-walkthrough chapters for NDK documentation

Change-Id: If7422f36d5489271776c7ed085059502e1cdebea

9 years agoDon't leak starting window when app crashes before adding windows
Wale Ogunwale [Sun, 24 May 2015 19:36:21 +0000 (12:36 -0700)]
Don't leak starting window when app crashes before adding windows

It is possible for us to leak an app starting window if the app it
is associated with fails to start before adding any windows. This
causes the starting window to permanently be visible at the layer
it occupies.

We now remove the starting window immediately when the app token
is been removed if it is the last window in the token and it isn't
animating.

Bug: 21375344
Change-Id: Ib3da148501645a44736c639c0181c3fabe0138e8

9 years agoam 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.
Dirk Dougherty [Sun, 24 May 2015 13:57:08 +0000 (13:57 +0000)]
am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.

* commit '82159cd537c706f3dd7e33d0683705ebccffc370':
  Doc change: Updates to preview and distribute.