OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 19abfb77: am 337089c8: am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs...
David Friedman [Tue, 26 May 2015 06:25:43 +0000 (06:25 +0000)]
am 19abfb77: am 337089c8: am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation

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

9 years agoam 0651e193: am b4ad97fc: am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge...
Oliver Woodman [Tue, 26 May 2015 06:25:39 +0000 (06:25 +0000)]
am 0651e193: am b4ad97fc: 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 '0651e193ada712940c6d489d5ca5439a47a15bcb':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

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

* commit '6752bf21318c38f364c846772842799c0cc02aa1':
  frameworks/base/docs/ndk: add missing doxygen css

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

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

9 years agoam b4ad97fc: am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most...
Oliver Woodman [Tue, 26 May 2015 06:12:52 +0000 (06:12 +0000)]
am b4ad97fc: 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 'b4ad97fc193e1a2d5e6254298f176742fbdfddb7':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

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

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

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 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 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 72f78064: am 47cfee9d: Fix initial keyguard user switcher state
Adrian Roos [Tue, 26 May 2015 01:30:57 +0000 (01:30 +0000)]
am 72f78064: am 47cfee9d: Fix initial keyguard user switcher state

* commit '72f780640201e34679d3377dc6b53a095ab9608f':
  Fix initial keyguard user switcher state

9 years agoam 47cfee9d: Fix initial keyguard user switcher state
Adrian Roos [Tue, 26 May 2015 01:19:40 +0000 (01:19 +0000)]
am 47cfee9d: Fix initial keyguard user switcher state

* commit '47cfee9d037584bed724f9786d10f85b048e58d0':
  Fix initial keyguard user switcher state

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 agoam 46b4ef8f: am 20c8fcaa: Merge "update app compatibility post launch detection"...
Guang Zhu [Mon, 25 May 2015 19:55:29 +0000 (19:55 +0000)]
am 46b4ef8f: am 20c8fcaa: Merge "update app compatibility post launch detection" into mnc-dev

* commit '46b4ef8fa2577ae4113520630a0ffda7566a09ed':
  update app compatibility post launch detection

9 years agoam 5b9b147f: am b9bc9720: am 31a84561: am 0417dbac: Merge "Doc change: remove older...
Dirk Dougherty [Mon, 25 May 2015 19:55:23 +0000 (19:55 +0000)]
am 5b9b147f: am b9bc9720: 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 '5b9b147f12820f77f667e29d1bd9d6e7739d2e7b':
  Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.

9 years agoam 20c8fcaa: Merge "update app compatibility post launch detection" into mnc-dev
Guang Zhu [Mon, 25 May 2015 19:44:14 +0000 (19:44 +0000)]
am 20c8fcaa: Merge "update app compatibility post launch detection" into mnc-dev

* commit '20c8fcaae502b5b3064227a8a804ce1d88c6a2b0':
  update app compatibility post launch detection

9 years agoam b9bc9720: am 31a84561: am 0417dbac: Merge "Doc change: remove older diffs from...
Dirk Dougherty [Mon, 25 May 2015 19:44:08 +0000 (19:44 +0000)]
am b9bc9720: 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 'b9bc972011b7c5de0a2034979c9e6f58345f01fe':
  Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.

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 agoam a543fd43: (-s ours) am 47e745c9: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 25 May 2015 18:31:57 +0000 (18:31 +0000)]
am a543fd43: (-s ours) am 47e745c9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a543fd434653bb0de04ea49b3d35cf79e25bc09a':
  Import translations. DO NOT MERGE

9 years agoam 47e745c9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 18:20:58 +0000 (18:20 +0000)]
am 47e745c9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '47e745c9786f757c2351e7192b7cd76527b95861':
  Import translations. DO NOT MERGE

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 agoam 306489d7: (-s ours) am c38fbbe1: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 25 May 2015 15:28:47 +0000 (15:28 +0000)]
am 306489d7: (-s ours) am c38fbbe1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '306489d7986179685702677afc44017d0fc8ecaf':
  Import translations. DO NOT MERGE

9 years agoam c38fbbe1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 15:16:53 +0000 (15:16 +0000)]
am c38fbbe1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c38fbbe1033a7206ebd80765cc8df49a6bc0693d':
  Import translations. DO NOT MERGE

9 years agoam a3353476: (-s ours) am 32156a75: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 15:16:43 +0000 (15:16 +0000)]
am a3353476: (-s ours) am 32156a75: (-s ours) Import translations. DO NOT MERGE

* commit 'a335347624b60cb64d0bbacc17b966d0d7384aa6':
  Import translations. DO NOT MERGE

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 agoam 32156a75: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 15:04:07 +0000 (15:04 +0000)]
am 32156a75: (-s ours) Import translations. DO NOT MERGE

* commit '32156a7586c5f33d9787074b093cffb317c11f3d':
  Import translations. DO NOT MERGE

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 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 agoam d8bd7dd9: am 26aba8de: am 82159cd5: am 10d44b75: Doc change: Updates to preview...
Dirk Dougherty [Sun, 24 May 2015 14:47:36 +0000 (14:47 +0000)]
am d8bd7dd9: am 26aba8de: am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.

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

9 years agoam 26aba8de: am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.
Dirk Dougherty [Sun, 24 May 2015 14:20:16 +0000 (14:20 +0000)]
am 26aba8de: am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.

* commit '26aba8dee401f20983d1499feb055008489f0f1a':
  Doc change: Updates to preview and distribute.

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.

9 years agoam 10d44b75: Doc change: Updates to preview and distribute.
Dirk Dougherty [Sun, 24 May 2015 12:31:01 +0000 (12:31 +0000)]
am 10d44b75: Doc change: Updates to preview and distribute.

* commit '10d44b7581b67d6619c7060ca1d339e0d355c7af':
  Doc change: Updates to preview and distribute.

9 years agoDoc change: Updates to preview and distribute.
Dirk Dougherty [Sat, 23 May 2015 21:46:57 +0000 (14:46 -0700)]
Doc change: Updates to preview and distribute.

Change-Id: I097213ce68d50d10b23840f2ad61f26279293948

9 years agoDoc change: remove older diffs from static server hosting. Requests will redirect...
Dirk Dougherty [Sat, 23 May 2015 23:32:50 +0000 (16:32 -0700)]
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.

Change-Id: Id3144b172808b1cde555d778f31ad5b4db0d941b

9 years agoam 43e181d0: am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev
Svet Ganov [Sat, 23 May 2015 20:55:51 +0000 (20:55 +0000)]
am 43e181d0: am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev

* commit '43e181d0fb9fb91db20fdb54a33ad9b33d7f19c9':
  Hide pakcage installer system APIs.

9 years agoam a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev
Svet Ganov [Sat, 23 May 2015 20:44:33 +0000 (20:44 +0000)]
am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev

* commit 'a75902439403966b9308d38fcf5e51c20e43a583':
  Hide pakcage installer system APIs.

9 years agoMerge "Hide pakcage installer system APIs." into mnc-dev
Svet Ganov [Sat, 23 May 2015 20:31:54 +0000 (20:31 +0000)]
Merge "Hide pakcage installer system APIs." into mnc-dev

9 years agoHide pakcage installer system APIs.
Svet Ganov [Sat, 23 May 2015 20:25:11 +0000 (13:25 -0700)]
Hide pakcage installer system APIs.

Change-Id: If5245ed2be7a3ebb50a7af924be85894314f6f47

9 years agoam eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlay...
Oliver Woodman [Sat, 23 May 2015 11:29:02 +0000 (11:29 +0000)]
am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

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

9 years agoMerge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site....
Oliver Woodman [Sat, 23 May 2015 11:15:34 +0000 (11:15 +0000)]
Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

9 years agoam eef2f6f4: am 75a3f34e: am 3b521a6a: am 38097510: docs: M Preview - Automatic Backu...
Joe Fernandez [Sat, 23 May 2015 10:44:57 +0000 (10:44 +0000)]
am eef2f6f4: am 75a3f34e: am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page

* commit 'eef2f6f4103ac1a3f385708bd45930d0306f6f46':
  docs: M Preview - Automatic Backups (Dolly) page

9 years agoam 75a3f34e: am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly...
Joe Fernandez [Sat, 23 May 2015 10:33:46 +0000 (10:33 +0000)]
am 75a3f34e: am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page

* commit '75a3f34e7616167dfc0979470523ed3c333dd85a':
  docs: M Preview - Automatic Backups (Dolly) page

9 years agoam 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Sat, 23 May 2015 10:22:21 +0000 (10:22 +0000)]
am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page

* commit '3b521a6ad53710171efee6c2ea72b4c3c5f37101':
  docs: M Preview - Automatic Backups (Dolly) page

9 years agoam 38097510: docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Sat, 23 May 2015 10:08:49 +0000 (10:08 +0000)]
am 38097510: docs: M Preview - Automatic Backups (Dolly) page

* commit '380975104a9246c4f72f7882d855aec524267b6f':
  docs: M Preview - Automatic Backups (Dolly) page

9 years agoam 9f61dc8b: am d7c91c0d: am 08162fec: am 84fff53c: Merge "docs: M Preview - update...
Joe Fernandez [Sat, 23 May 2015 10:03:12 +0000 (10:03 +0000)]
am 9f61dc8b: am d7c91c0d: am 08162fec: am 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs

* commit '9f61dc8b8a0ac9c738f007e0b7f69d9e08d2a9e5':
  docs: M Preview - update the preview section TOC

9 years agodocs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Wed, 13 May 2015 08:13:51 +0000 (01:13 -0700)]
docs: M Preview - Automatic Backups (Dolly) page

Change-Id: Ia9e6815271f5f22d6f11f1d61e68b6670f51a53d

9 years agoam d7c91c0d: am 08162fec: am 84fff53c: Merge "docs: M Preview - update the preview...
Joe Fernandez [Sat, 23 May 2015 09:51:33 +0000 (09:51 +0000)]
am d7c91c0d: am 08162fec: am 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs

* commit 'd7c91c0d07f81a38a421552186346787dca24873':
  docs: M Preview - update the preview section TOC

9 years agoam 08162fec: am 84fff53c: Merge "docs: M Preview - update the preview section TOC...
Joe Fernandez [Sat, 23 May 2015 09:39:38 +0000 (09:39 +0000)]
am 08162fec: am 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs

* commit '08162fec0c6fe49dbc190457e9a898c961467b60':
  docs: M Preview - update the preview section TOC

9 years agoam 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-previe...
Joe Fernandez [Sat, 23 May 2015 08:03:24 +0000 (08:03 +0000)]
am 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs

* commit '84fff53cd73ed017ed1f9342d39cc496fe74cac2':
  docs: M Preview - update the preview section TOC

9 years agoMerge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
Joe Fernandez [Sat, 23 May 2015 07:50:48 +0000 (07:50 +0000)]
Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs

9 years agodocs: M Preview - update the preview section TOC
Joe Fernandez [Sat, 16 May 2015 00:38:39 +0000 (17:38 -0700)]
docs: M Preview - update the preview section TOC

Change-Id: I5776d367df3baec13aee27a8e920de9d9b69782d

9 years agoam c8aaab82: am 5940f4bd: am 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix...
Johan Euphrosine [Sat, 23 May 2015 05:08:35 +0000 (05:08 +0000)]
am c8aaab82: am 5940f4bd: am 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page

* commit 'c8aaab82a408598982b5bba1c9e5669ae81aea17':
  frameworks/base/docs/ndk: fix typo in landing page

9 years agoam 5940f4bd: am 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing...
Johan Euphrosine [Sat, 23 May 2015 04:56:55 +0000 (04:56 +0000)]
am 5940f4bd: am 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page

* commit '5940f4bd997a2da552073e92fc15971bc2834e5b':
  frameworks/base/docs/ndk: fix typo in landing page

9 years agoam 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 04:45:32 +0000 (04:45 +0000)]
am 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page

* commit '33a4f81edbb0047aef34126e6d584b168d992862':
  frameworks/base/docs/ndk: fix typo in landing page

9 years agoam 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 04:33:18 +0000 (04:33 +0000)]
am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page

* commit '6a7406bc1787d0b555ca3a3226a291d42554a94c':
  frameworks/base/docs/ndk: fix typo in landing page

9 years agoam 5365ad4a: am 801ca67c: am 528cf52e: am 6cf938c3: Merge "docs: Add sample links...
Joe Fernandez [Sat, 23 May 2015 01:41:20 +0000 (01:41 +0000)]
am 5365ad4a: am 801ca67c: am 528cf52e: am 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs

* commit '5365ad4a154ef45267a145c91d7e3f4e88d385e2':
  docs: Add sample links and descriptions for M Preview

9 years agoam f2ec459d: am d0acf062: Merge "Revert "Fix build."" into mnc-dev
Deepanshu Gupta [Sat, 23 May 2015 01:41:15 +0000 (01:41 +0000)]
am f2ec459d: am d0acf062: Merge "Revert "Fix build."" into mnc-dev

* commit 'f2ec459d853cb1a47138d00c7123dd1b83363462':
  Revert "Fix build."

9 years agoam 2d72ded2: am ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
Jean-Michel Trivi [Sat, 23 May 2015 01:41:10 +0000 (01:41 +0000)]
am 2d72ded2: am ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev

* commit '2d72ded27cd4ce78a42bb4c0d73cb2fc3c3cf3e3':
  More android.media.AudioFormat javadoc

9 years agoam 801ca67c: am 528cf52e: am 6cf938c3: Merge "docs: Add sample links and descriptions...
Joe Fernandez [Sat, 23 May 2015 01:29:36 +0000 (01:29 +0000)]
am 801ca67c: am 528cf52e: am 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs

* commit '801ca67cb6b85c2ad17106d8cad4cc7bff8ea4e0':
  docs: Add sample links and descriptions for M Preview

9 years agoam d0acf062: Merge "Revert "Fix build."" into mnc-dev
Deepanshu Gupta [Sat, 23 May 2015 01:29:31 +0000 (01:29 +0000)]
am d0acf062: Merge "Revert "Fix build."" into mnc-dev

* commit 'd0acf0627aa5f78cbf5bb189c7097546b86abebc':
  Revert "Fix build."

9 years agoam ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
Jean-Michel Trivi [Sat, 23 May 2015 01:29:26 +0000 (01:29 +0000)]
am ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev

* commit 'ed77bc09879784a56c60f215f267adc100213ed2':
  More android.media.AudioFormat javadoc

9 years agoam 528cf52e: am 6cf938c3: Merge "docs: Add sample links and descriptions for M Previe...
Joe Fernandez [Sat, 23 May 2015 01:22:10 +0000 (01:22 +0000)]
am 528cf52e: am 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs

* commit '528cf52e76c340caf2f0f9e6ef5b84ab4bd5b887':
  docs: Add sample links and descriptions for M Preview

9 years agoMerge "Revert "Fix build."" into mnc-dev
Deepanshu Gupta [Sat, 23 May 2015 01:21:09 +0000 (01:21 +0000)]
Merge "Revert "Fix build."" into mnc-dev

9 years agoRevert "Fix build."
Deepanshu Gupta [Sat, 23 May 2015 01:19:23 +0000 (01:19 +0000)]
Revert "Fix build."

This reverts commit 97b3ae1a8766616675ebf2323a97d8adfd41bfdc.

Reverted since 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts
the commit that warranted this change.

Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f

9 years agoMerge "More android.media.AudioFormat javadoc" into mnc-dev
Jean-Michel Trivi [Sat, 23 May 2015 01:19:01 +0000 (01:19 +0000)]
Merge "More android.media.AudioFormat javadoc" into mnc-dev

9 years agoMore android.media.AudioFormat javadoc
Jean-Michel Trivi [Thu, 21 May 2015 22:51:15 +0000 (15:51 -0700)]
More android.media.AudioFormat javadoc

More doc about AudioFormat constants, use of the builder,
 sample rate, channel masks (position vs index, examples)

Bug 20921159

Change-Id: Ie60c2f3558b8b6008c6d9fb646ad9f6de396859d

9 years agoam 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc...
Joe Fernandez [Sat, 23 May 2015 01:09:02 +0000 (01:09 +0000)]
am 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs

* commit '6cf938c3021dd3492b43de6ee2664609e041a0c8':
  docs: Add sample links and descriptions for M Preview

9 years agoframeworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 01:01:57 +0000 (18:01 -0700)]
frameworks/base/docs/ndk: fix typo in landing page

Change-Id: Ie792506b73e85dd58ebf481339801aa1d8036031

9 years agoam 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a...
Dianne Hackborn [Sat, 23 May 2015 00:58:27 +0000 (00:58 +0000)]
am 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev

* commit '54d803c0274137998c7dbb9d7b8af58de13be5b6':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"

9 years agoMerge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
Joe Fernandez [Sat, 23 May 2015 00:57:21 +0000 (00:57 +0000)]
Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs

9 years agoam dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"...
Dianne Hackborn [Sat, 23 May 2015 00:44:55 +0000 (00:44 +0000)]
am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev

* commit 'dd5ee4b89083ec9b50b8c9739274136b0c74abb5':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"

9 years agoam c2e945ba: am aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent...
Simranjit Singh Kohli [Sat, 23 May 2015 00:44:24 +0000 (00:44 +0000)]
am c2e945ba: am aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev

* commit 'c2e945ba37ecb09c640de88abbcc60f5ad76efb8':
  [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]

9 years agoam e54887a0: am 8f51279d: am c56a8313: am b1410bc3: Merge "Doc change: updates for...
Dirk Dougherty [Sat, 23 May 2015 00:44:17 +0000 (00:44 +0000)]
am e54887a0: am 8f51279d: am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs

* commit 'e54887a085969743f8c91b7b34bbcf9aa441a9e8':
  Doc change: updates for preview.

9 years agoam 9c06916e: am 8cdd693a: am 93cc5190: am b373f49a: docs: NDK table of contents fixes
Joe Fernandez [Sat, 23 May 2015 00:44:12 +0000 (00:44 +0000)]
am 9c06916e: am 8cdd693a: am 93cc5190: am b373f49a: docs: NDK table of contents fixes

* commit '9c06916e79751213f8954036f56922d356536c0f':
  docs: NDK table of contents fixes

9 years agoMerge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev
Dianne Hackborn [Sat, 23 May 2015 00:34:34 +0000 (00:34 +0000)]
Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev

9 years agoam aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes...
Simranjit Singh Kohli [Sat, 23 May 2015 00:33:32 +0000 (00:33 +0000)]
am aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev

* commit 'aefdaa5cbd2a68aa6c8e7d229b897237562cebcb':
  [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]

9 years agoam 8f51279d: am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into...
Dirk Dougherty [Sat, 23 May 2015 00:33:26 +0000 (00:33 +0000)]
am 8f51279d: am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs

* commit '8f51279d50fab3270e1c13dc65c4e38a3a735ef6':
  Doc change: updates for preview.

9 years agoam 8cdd693a: am 93cc5190: am b373f49a: docs: NDK table of contents fixes
Joe Fernandez [Sat, 23 May 2015 00:33:21 +0000 (00:33 +0000)]
am 8cdd693a: am 93cc5190: am b373f49a: docs: NDK table of contents fixes

* commit '8cdd693ae1ed41ae175df79f77492743444a8d24':
  docs: NDK table of contents fixes

9 years agoam 031f1bc9: am 7870550a: Merge "Add getPermissionGrantState method in device policy...
Amith Yamasani [Sat, 23 May 2015 00:26:32 +0000 (00:26 +0000)]
am 031f1bc9: am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev

* commit '031f1bc9ee6d79591e4bf2c4c30d616e87fc6f6b':
  Add getPermissionGrantState method in device policy

9 years agoMerge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
Simranjit Singh Kohli [Sat, 23 May 2015 00:20:38 +0000 (00:20 +0000)]
Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev

9 years agoam c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview...
Dirk Dougherty [Sat, 23 May 2015 00:19:53 +0000 (00:19 +0000)]
am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs

* commit 'c56a8313760243740b684fef4ae71d791a885b4d':
  Doc change: updates for preview.

9 years agoam 93cc5190: am b373f49a: docs: NDK table of contents fixes
Joe Fernandez [Sat, 23 May 2015 00:19:48 +0000 (00:19 +0000)]
am 93cc5190: am b373f49a: docs: NDK table of contents fixes

* commit '93cc51908c6d57d43f5a2ae98a850aaa67ac6b64':
  docs: NDK table of contents fixes

9 years ago[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Simranjit Singh Kohli [Fri, 22 May 2015 21:00:32 +0000 (14:00 -0700)]
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]

Fixing lots of bugs related to the ChooseAccount Activities.
1. Fix jank which is seen when no accounts are present on the device.
2. After addition of the account, return to the user.
3. Don't crash when the user provides null to allowableAccountTypes.
4. Updated documentation of AccountManager#newChooseAccountIntent.
5. Fix NPE.

Bug: 13104800
Bug: 17926560
Bug: 9626001

Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1

9 years agoam 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev
Amith Yamasani [Sat, 23 May 2015 00:12:56 +0000 (00:12 +0000)]
am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev

* commit '7870550a1b6e1110bf461633970e439d0243a868':
  Add getPermissionGrantState method in device policy

9 years agoam b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Sat, 23 May 2015 00:08:42 +0000 (00:08 +0000)]
am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs

* commit 'b1410bc306195dc807f223bc5955780275fc6468':
  Doc change: updates for preview.

9 years agoam b373f49a: docs: NDK table of contents fixes
Joe Fernandez [Sat, 23 May 2015 00:08:36 +0000 (00:08 +0000)]
am b373f49a: docs: NDK table of contents fixes

* commit 'b373f49a85fcbe82993940416ce04e0a1fb1e340':
  docs: NDK table of contents fixes

9 years agoMerge "Add getPermissionGrantState method in device policy" into mnc-dev
Amith Yamasani [Sat, 23 May 2015 00:05:46 +0000 (00:05 +0000)]
Merge "Add getPermissionGrantState method in device policy" into mnc-dev

9 years agoMerge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:59:16 +0000 (23:59 +0000)]
Merge "Doc change: updates for preview." into mnc-preview-docs