OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription...
Sanket Padawe [Sat, 17 Jan 2015 22:20:19 +0000 (22:20 +0000)]
am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

* commit 'd2dd69ae8d81defc5f2286690b3dd246d4118fcc':
  Modify getDeviceId() to get device id independent of Subscription.

9 years agoMerge "Modify getDeviceId() to get device id independent of Subscription." into lmp...
Sanket Padawe [Sat, 17 Jan 2015 22:15:54 +0000 (22:15 +0000)]
Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

9 years agoam c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captio...
Scott Rowe [Sat, 17 Jan 2015 05:25:25 +0000 (05:25 +0000)]
am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit 'c68ab86a8cef8b8ca4588e7eb482c5acf9821aa9':
  docs: removing code captions

9 years agoam 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot"...
Scott Rowe [Sat, 17 Jan 2015 05:25:20 +0000 (05:25 +0000)]
am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit '278f5e2a63961f468457ab00ceeaec84aff7bc61':
  docs: Add screenshot

9 years agoam ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into...
Scott Rowe [Sat, 17 Jan 2015 05:20:28 +0000 (05:20 +0000)]
am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit 'ae15e779c0a0a9005292efb0f39729454429fa7f':
  docs: removing code captions

9 years agoam 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 05:20:23 +0000 (05:20 +0000)]
am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
  docs: Add screenshot

9 years agoam 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 03:06:38 +0000 (03:06 +0000)]
am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit '224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
  docs: removing code captions

9 years agoam 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 03:06:35 +0000 (03:06 +0000)]
am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit '78001f9338b72876e95b7d25053b706804a21070':
  docs: Add screenshot

9 years agoam c987ca05: Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 02:28:51 +0000 (02:28 +0000)]
am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions

9 years agoam ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 02:28:47 +0000 (02:28 +0000)]
am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
  docs: Add screenshot

9 years agoMerge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:52 +0000 (01:31 +0000)]
Merge "docs: removing code captions" into lmp-docs

9 years agoMerge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:13 +0000 (01:31 +0000)]
Merge "docs: Add screenshot" into lmp-docs

9 years agoam 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level...
David Friedman [Sat, 17 Jan 2015 00:51:42 +0000 (00:51 +0000)]
am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit '91678a69b26f218dd580704cd4f79c295c8c5951':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoam ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android...
David Friedman [Sat, 17 Jan 2015 00:43:30 +0000 (00:43 +0000)]
am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoam e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja...
David Friedman [Sat, 17 Jan 2015 00:36:27 +0000 (00:36 +0000)]
am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit 'e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoam fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es...
David Friedman [Sat, 17 Jan 2015 00:30:18 +0000 (00:30 +0000)]
am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoMerge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh...
David Friedman [Sat, 17 Jan 2015 00:23:29 +0000 (00:23 +0000)]
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

9 years agoLocalization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
David Friedman [Wed, 19 Nov 2014 21:03:45 +0000 (13:03 -0800)]
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f

9 years agoam d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
RoboErik [Fri, 16 Jan 2015 23:04:10 +0000 (23:04 +0000)]
am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev

* commit 'd5ff63ba0ce8597155e0201fd20fe18fbf0aa053':
  Notify the system of all remote volume changes

9 years agoMerge "Notify the system of all remote volume changes" into lmp-mr1-dev
RoboErik [Fri, 16 Jan 2015 22:56:52 +0000 (22:56 +0000)]
Merge "Notify the system of all remote volume changes" into lmp-mr1-dev

9 years agoam 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game...
Quddus Chong [Fri, 16 Jan 2015 22:44:07 +0000 (22:44 +0000)]
am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit '2f63207d873fcd2c39488f78b5cb1b67f868f232':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller...
Quddus Chong [Fri, 16 Jan 2015 22:35:03 +0000 (22:35 +0000)]
am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit 'a649122977a6f1c267329b9b67a692cabd839e98':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample...
Joe Fernandez [Fri, 16 Jan 2015 22:34:46 +0000 (22:34 +0000)]
am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '35aecbe92761c7608ce3942f5743bae8254fdaf6':
  docs: adding studio-sample-in-editor.png file

9 years agoam 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable...
Ricardo Cervera [Fri, 16 Jan 2015 22:34:42 +0000 (22:34 +0000)]
am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit '7a2e85c83eabe113ca05d2ecf4633008d601a560':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoam cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor...
Joe Fernandez [Fri, 16 Jan 2015 22:29:48 +0000 (22:29 +0000)]
am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit 'cd50066386887148f99dce9b449bed588a354bb3':
  docs: adding studio-sample-in-editor.png file

9 years agoam 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib...
Ricardo Cervera [Fri, 16 Jan 2015 22:29:43 +0000 (22:29 +0000)]
am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoam 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code...
Quddus Chong [Fri, 16 Jan 2015 22:28:24 +0000 (22:28 +0000)]
am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit '930ac01fd728067a79335e2983b870528c13a872':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into...
Joe Fernandez [Fri, 16 Jan 2015 22:23:22 +0000 (22:23 +0000)]
am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
  docs: adding studio-sample-in-editor.png file

9 years agoam 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Fri, 16 Jan 2015 22:23:19 +0000 (22:23 +0000)]
am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit '73f36d47465da113f39270f4f9cf5d601aa0b585':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoam de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets....
Quddus Chong [Fri, 16 Jan 2015 22:21:34 +0000 (22:21 +0000)]
am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit 'de0a87007b987a76af2ddd526dd473ad83fbb74b':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
Svet Ganov [Fri, 16 Jan 2015 22:18:57 +0000 (22:18 +0000)]
am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev

* commit '830f39ad3cb2c0ff2300c7288e695def37e3b1dd':
  Fixing a memory leak: activities are leaked.

9 years agoam 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 22:15:25 +0000 (22:15 +0000)]
am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
  docs: adding studio-sample-in-editor.png file

9 years agoam e229751d: docs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Fri, 16 Jan 2015 22:15:21 +0000 (22:15 +0000)]
am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit 'e229751d11692ede7fed3b56472f2d020767b412':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoMerge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
Svet Ganov [Fri, 16 Jan 2015 22:12:55 +0000 (22:12 +0000)]
Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev

9 years agoMerge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906...
Quddus Chong [Fri, 16 Jan 2015 22:03:31 +0000 (22:03 +0000)]
Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

9 years agoMerge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 21:58:36 +0000 (21:58 +0000)]
Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

9 years agoam ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev
Craig Mautner [Fri, 16 Jan 2015 21:01:25 +0000 (21:01 +0000)]
am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev

* commit 'ac70b2d1722fd3ad94b2bf1e8c7695bded56987a':
  More debugging for bug 18201239.

9 years agoMerge "More debugging for bug 18201239." into lmp-mr1-dev
Craig Mautner [Fri, 16 Jan 2015 20:56:57 +0000 (20:56 +0000)]
Merge "More debugging for bug 18201239." into lmp-mr1-dev

9 years agoMore debugging for bug 18201239.
Craig Mautner [Fri, 16 Jan 2015 20:48:16 +0000 (12:48 -0800)]
More debugging for bug 18201239.

Fixes bug 19045133.

Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a

9 years agoam 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Fri, 16 Jan 2015 20:46:48 +0000 (20:46 +0000)]
am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '2c8e6daab7158ee2a5fd3eff0cd5f5d61961fa27':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Fri, 16 Jan 2015 20:40:17 +0000 (20:40 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 16 Jan 2015 20:37:30 +0000 (12:37 -0800)]
Import translations. DO NOT MERGE

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

9 years agodocs: adding studio-sample-in-editor.png file
Rich Slogar [Fri, 16 Jan 2015 20:26:20 +0000 (12:26 -0800)]
docs: adding studio-sample-in-editor.png file

Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505

9 years agoam 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether...
Winson Chung [Fri, 16 Jan 2015 20:15:30 +0000 (20:15 +0000)]
am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev

* commit '166cf980afafb83add7479cfeb3a8e0283cfee81':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)

9 years agoMerge "DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recen...
Winson Chung [Fri, 16 Jan 2015 20:09:38 +0000 (20:09 +0000)]
Merge "DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev

9 years agoam fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space...
Joe Fernandez [Fri, 16 Jan 2015 20:05:37 +0000 (20:05 +0000)]
am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit 'fadcbc705f8669ce5276089da466bd08f8bb11e1':
  docs: studio disk space requirements typo

9 years agoam 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager...
Joe Fernandez [Fri, 16 Jan 2015 19:57:35 +0000 (19:57 +0000)]
am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit '478d4e86ffc98c4d4a83efebe651d2e06e6af6d2':
  docs: link to sdk manager

9 years agoam ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory...
Ricardo Cervera [Fri, 16 Jan 2015 19:57:31 +0000 (19:57 +0000)]
am ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit 'ddcc21610ffb756a610b29aa9bfcbbb4cb5c94ca':
  docs: Added info on noHistory and onActivityResult().

9 years agoam b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements...
Joe Fernandez [Fri, 16 Jan 2015 19:55:52 +0000 (19:55 +0000)]
am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit 'b7ac4dff3d97865cde5d6876d30dde0a77848f25':
  docs: studio disk space requirements typo

9 years agoam 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp...
Joe Fernandez [Fri, 16 Jan 2015 19:51:08 +0000 (19:51 +0000)]
am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit '0b596de9a4cc9b8d0694838f4b699c722d448bac':
  docs: link to sdk manager

9 years agoam c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityRe...
Ricardo Cervera [Fri, 16 Jan 2015 19:51:04 +0000 (19:51 +0000)]
am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit 'c12a3e35a4330d5b60ac652597a6875868d96e55':
  docs: Added info on noHistory and onActivityResult().

9 years agoam aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into...
Joe Fernandez [Fri, 16 Jan 2015 19:49:08 +0000 (19:49 +0000)]
am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit 'aafd29beb8d455fd825e2f0f0f8792b1ca6dc6ca':
  docs: studio disk space requirements typo

9 years agodocs: Fixed typos in Game Controller training code snippets.
Quddus Chong [Fri, 16 Jan 2015 19:35:07 +0000 (11:35 -0800)]
docs: Fixed typos in Game Controller training code snippets.
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27

9 years agodocs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Tue, 13 Jan 2015 18:04:04 +0000 (10:04 -0800)]
docs: Add browseable Wearable Support Lib Javadoc

Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1

9 years agoam c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:57:42 +0000 (18:57 +0000)]
am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit 'c6f70adf2439978954fefe00a9ff24135654ed52':
  docs: link to sdk manager

9 years agoam 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 16 Jan 2015 18:57:39 +0000 (18:57 +0000)]
am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit '85bfcbd3e2367768c1d026cbba6fe0fa9a6b2dae':
  docs: Added info on noHistory and onActivityResult().

9 years agoam 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:56:25 +0000 (18:56 +0000)]
am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit '8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4':
  docs: studio disk space requirements typo

9 years agoam c84021ba: Merge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:52:12 +0000 (18:52 +0000)]
am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit 'c84021ba99d9326b016120a1d7aab4ee551bcce9':
  docs: link to sdk manager

9 years agoam 97c4ba98: docs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 16 Jan 2015 18:52:08 +0000 (18:52 +0000)]
am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit '97c4ba9862006e2c9f4cea07f55dc7120d305e5a':
  docs: Added info on noHistory and onActivityResult().

9 years agoMerge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:49:27 +0000 (18:49 +0000)]
Merge "docs: studio disk space requirements typo" into lmp-docs

9 years agoMerge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:47:51 +0000 (18:47 +0000)]
Merge "docs: link to sdk manager" into lmp-docs

9 years agoam 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to...
Ricardo Cervera [Fri, 16 Jan 2015 18:41:59 +0000 (18:41 +0000)]
am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '90312d808f4a5181b5cb99c78e64b7e5d1465895':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
Ricardo Cervera [Fri, 16 Jan 2015 18:36:45 +0000 (18:36 +0000)]
am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
Ricardo Cervera [Fri, 16 Jan 2015 18:29:25 +0000 (18:29 +0000)]
am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoFixing a memory leak: activities are leaked.
Svet Ganov [Fri, 16 Jan 2015 18:10:15 +0000 (10:10 -0800)]
Fixing a memory leak: activities are leaked.

TextLine was not fully cleared before recycling it which leads to
activity leaks if the activity happens: to register a text watcher.

bug:19045507

Change-Id: Ife0f7ce29865bd30ca2dfe8795023f51f275d659

9 years agoam 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions...
Rich Slogar [Fri, 16 Jan 2015 18:11:01 +0000 (18:11 +0000)]
am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs

* commit '8a7f20f5a4d83580470133a9a325a66edbb7363e':
  docs: studio support library revisions update

9 years agoam f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics informati...
Dirk Dougherty [Fri, 16 Jan 2015 18:10:56 +0000 (18:10 +0000)]
am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

* commit 'f83ae5cd59ed36dd2cd26b88f29582be08c1a134':
  Doc change: Add new analytics information to Distribute.

9 years agoam a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 18:10:50 +0000 (18:10 +0000)]
am a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs

* commit 'a84faf0f154bb1097c3206df5710da739dcd03f7':
  docs: build link update

9 years agoam ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into...
Rich Slogar [Fri, 16 Jan 2015 18:10:45 +0000 (18:10 +0000)]
am ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs

* commit 'ab8a5a0ea8f9334b997e11c80cba71d024fb8803':
  docs: Plugin reference update

9 years agoam d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update...
Rich Slogar [Fri, 16 Jan 2015 18:10:40 +0000 (18:10 +0000)]
am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs

* commit 'd15015d206cc3feb3c5a8f6327f71d16432ceca0':
  docs: studio sample procedure update

9 years agoam b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into...
Rich Slogar [Fri, 16 Jan 2015 18:03:41 +0000 (18:03 +0000)]
am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs

* commit 'b43a7eefb75b2a6397d738055389567e1faa21d9':
  docs: studio support library revisions update

9 years agoam 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distrib...
Dirk Dougherty [Fri, 16 Jan 2015 18:03:36 +0000 (18:03 +0000)]
am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

* commit '7b7f074f282e551439b0b3c40a4ccb44d2981006':
  Doc change: Add new analytics information to Distribute.

9 years agoam 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 18:03:32 +0000 (18:03 +0000)]
am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs

* commit '3505303a3aa113058bca58a1cdf3c84449b6712e':
  docs: build link update

9 years agoam f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 18:03:28 +0000 (18:03 +0000)]
am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs

* commit 'f1feda36fbaebf22bf3e06d05ae186ada39a3e1e':
  docs: Plugin reference update

9 years agoam f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 18:03:23 +0000 (18:03 +0000)]
am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs

* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update

9 years agoNotify the system of all remote volume changes
RoboErik [Thu, 15 Jan 2015 23:09:09 +0000 (15:09 -0800)]
Notify the system of all remote volume changes

If a volume change occurred because it was sent through the MediaController directly
it wasn't showing the system's volume UI. This fixes things so the volume slider gets
shown for all volume requests with the SHOW_UI flag set.

bug:19036130
Change-Id: I1f7cb2e03386e2f3f7bc448cb4c38a71573775ff

9 years agoresolved conflicts for merge of e8f6bd48 to lmp-dev
Ricardo Cervera [Fri, 16 Jan 2015 17:54:30 +0000 (09:54 -0800)]
resolved conflicts for merge of e8f6bd48 to lmp-dev

Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff

9 years agodocs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 4 Apr 2014 18:17:06 +0000 (11:17 -0700)]
docs: Added info on noHistory and onActivityResult().

Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Ricardo Cervera [Fri, 16 Jan 2015 17:14:44 +0000 (17:14 +0000)]
am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev
Kenny Guy [Fri, 16 Jan 2015 11:24:56 +0000 (11:24 +0000)]
am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev

* commit 'fd846dfbf1d1e51f8366a473d3b6f5722c06d77c':
  Sync file before using JournaledFile commit.

9 years agoMerge "Sync file before using JournaledFile commit." into lmp-mr1-dev
Kenny Guy [Fri, 16 Jan 2015 11:21:17 +0000 (11:21 +0000)]
Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev

9 years agoam 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play
Jinsuk Kim [Fri, 16 Jan 2015 08:23:05 +0000 (08:23 +0000)]
am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play

* commit '2ab6d9fff36836c71bc0ee4afa25c11b48a9bd99':
  CEC: Do not send <Active Source> when TV wakes up by one touch play

9 years agoCEC: Do not send <Active Source> when TV wakes up by one touch play
Jinsuk Kim [Fri, 16 Jan 2015 06:49:16 +0000 (15:49 +0900)]
CEC: Do not send <Active Source> when TV wakes up by one touch play

TV should respect the device that wakes up TV by one touch play
to keep its active source status by not sending <Active Source>.

Bug: 19039773

Change-Id: I0b27e95dcf986df90b25cc2a1891acd82940f13e

9 years agoam 964c00dd: CEC: Buffer Cec messages while allocating logical address
Jinsuk Kim [Fri, 16 Jan 2015 08:17:07 +0000 (08:17 +0000)]
am 964c00dd: CEC: Buffer Cec messages while allocating logical address

* commit '964c00dd7b270dcf80aea3450bbfc23502965cce':
  CEC: Buffer Cec messages while allocating logical address

9 years agoCEC: Buffer Cec messages while allocating logical address
Jinsuk Kim [Fri, 16 Jan 2015 06:20:17 +0000 (15:20 +0900)]
CEC: Buffer Cec messages while allocating logical address

CEC messages arriving before logical address allocation was being
discarded. Handles them by introducing a message buffer class
to keep them till the address allocation is finished.

Also updated per-device message buffer to use copied version of
messages list for iterating to avoid the possible concurrent
modification exception.

Bug: 18896770
Change-Id: Ifb74fd265510de6dde322e0b3bc5b504fecb4daa

9 years agoam 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:58:57 +0000 (00:58 +0000)]
am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs

* commit '3212c3aa226f8cc7cf54e72772a001906fd4d7c3':
  docs: studio support library revisions update

9 years agoam d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into...
Dirk Dougherty [Fri, 16 Jan 2015 00:58:53 +0000 (00:58 +0000)]
am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

* commit 'd1ff86058a06874d6d607dea951b34370e053654':
  Doc change: Add new analytics information to Distribute.

9 years agoam 3b7dbd66: Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:15 +0000 (00:50 +0000)]
am 3b7dbd66: Merge "docs: build link update" into lmp-docs

* commit '3b7dbd66d8d8df89bb4700bfdfaf86f264ff7ea4':
  docs: build link update

9 years agoam 485b9566: Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:12 +0000 (00:50 +0000)]
am 485b9566: Merge "docs: Plugin reference update" into lmp-docs

* commit '485b9566a9fc98be8b4dee40ddca43690de1a465':
  docs: Plugin reference update

9 years agoam 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:08 +0000 (00:50 +0000)]
am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs

* commit '48fc1d7ba7e3e2c0efd71b3b7ed29997d3454857':
  docs: studio sample procedure update

9 years agoMerge "docs: studio support library revisions update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:43:56 +0000 (00:43 +0000)]
Merge "docs: studio support library revisions update" into lmp-docs

9 years agoMerge "Doc change: Add new analytics information to Distribute." into lmp-docs
Dirk Dougherty [Fri, 16 Jan 2015 00:41:55 +0000 (00:41 +0000)]
Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

9 years agoDoc change: Add new analytics information to Distribute.
Dirk Dougherty [Fri, 12 Dec 2014 19:51:13 +0000 (11:51 -0800)]
Doc change: Add new analytics information to Distribute.

Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84

9 years agoMerge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:49 +0000 (00:27 +0000)]
Merge "docs: build link update" into lmp-docs

9 years agoMerge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:00 +0000 (00:27 +0000)]
Merge "docs: Plugin reference update" into lmp-docs

9 years agoMerge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:26:38 +0000 (00:26 +0000)]
Merge "docs: studio sample procedure update" into lmp-docs

9 years agodocs: studio support library revisions update
Rich Slogar [Thu, 11 Dec 2014 23:51:18 +0000 (15:51 -0800)]
docs: studio support library revisions update

Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b

9 years agoam faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 15 Jan 2015 23:45:54 +0000 (23:45 +0000)]
am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 15 Jan 2015 23:39:47 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev