Scott Rowe
ab18d6c82e
Merge "docs: Add screenshot" into lmp-docs
2015-01-17 01:31:15 +00:00
David Friedman
8d53179c9c
am 1cca3f6e: am 912a9394: 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 '1cca3f6e3939f59d1e17f35ca50339fa46d24c27':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 01:09:05 +00:00
David Friedman
1cca3f6e39
am 912a9394: 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 '912a9394398db1b47f0294ffdebc4d78600573fd':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:59:45 +00:00
David Friedman
912a939439
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
2015-01-17 00:51:42 +00:00
David Friedman
91678a69b2
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
2015-01-17 00:43:30 +00:00
David Friedman
ae71c8ea52
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
2015-01-17 00:36:27 +00:00
Mike Lockwood
3d0fb88138
Merge "Replace broadcasts with calls to IAudioService.setWiredDeviceConnectionState() to report USB device status"
2015-01-17 00:33:42 +00:00
David Friedman
e255cb0f9e
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
2015-01-17 00:30:18 +00:00
David Friedman
fa66fdd57a
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
2015-01-17 00:23:30 +00:00
David Friedman
d28a49fb73
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
...
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
2015-01-16 15:42:26 -08:00
Alan Viverette
2ef9d1af45
Merge "Ensure spinner variables are initialized correctly"
2015-01-16 23:31:53 +00:00
RoboErik
864c4f42f8
am b2949e1b: am 694940be: am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
...
* commit 'b2949e1b957e8b74980a2c3124e834d13f53f29d':
Notify the system of all remote volume changes
2015-01-16 23:14:20 +00:00
RoboErik
b2949e1b95
am 694940be: am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
...
* commit '694940be699165aedc05d5f1ae9381cd61a368a7':
Notify the system of all remote volume changes
2015-01-16 23:08:32 +00:00
RoboErik
694940be69
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
2015-01-16 23:04:10 +00:00
RoboErik
d5ff63ba0c
Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
2015-01-16 22:56:54 +00:00
Quddus Chong
7a11b88bcd
am 6e2661f0: am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
...
* commit '6e2661f086327c7ebbbda03f3387b673f0bf87df':
docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:56:45 +00:00
Quddus Chong
6e2661f086
am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
...
* commit '20eb8093b634704ac29fda85e9c1c916a31bde29':
docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:50:17 +00:00
Joe Fernandez
090c5e01be
am 6a8c2b03: am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit '6a8c2b038c1d16856c642f80bf315828d1b96ad1':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:47:10 +00:00
Ricardo Cervera
ffff333c19
am eeb4cf8f: am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit 'eeb4cf8f43797f99543db1e404066d5291da6237':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:47:05 +00:00
Quddus Chong
20eb8093b6
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
2015-01-16 22:44:07 +00:00
Joe Fernandez
6a8c2b038c
am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit 'ff96449f1d3092182d61d5e553042742d5bf71c8':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:41:01 +00:00
Ricardo Cervera
eeb4cf8f43
am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '3fee7dc78af70ac9ca383f40e511ffaa378894b1':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:40:55 +00:00
Alan Viverette
3f221cf325
Ensure spinner variables are initialized correctly
...
Removes the popup context setter, since this property cannot change
after inflation without losing data from the AttributeSet.
Bug: 19046761
Change-Id: I622f50d1752446a5b5793706c388e67a46ad06da
2015-01-16 14:40:04 -08:00
Quddus Chong
2f63207d87
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
2015-01-16 22:35:03 +00:00
Joe Fernandez
ff96449f1d
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
2015-01-16 22:34:46 +00:00
Ricardo Cervera
3fee7dc78a
am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '7a2e85c83eabe113ca05d2ecf4633008d601a560':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:34:42 +00:00
Svet Ganov
22a08757b2
am 605ba802: am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
...
* commit '605ba802778ed67ddd2ca1af7f55df6f2d257765':
Fixing a memory leak: activities are leaked.
2015-01-16 22:31:38 +00:00
Joe Fernandez
35aecbe927
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
2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e
am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:29:43 +00:00
Quddus Chong
a649122977
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
2015-01-16 22:28:24 +00:00
Svet Ganov
605ba80277
am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
...
* commit '2004fdf8e54daa84a8c4da20909f81f37add66d5':
Fixing a memory leak: activities are leaked.
2015-01-16 22:25:01 +00:00
Joe Fernandez
cd50066386
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
2015-01-16 22:23:22 +00:00
Ricardo Cervera
9273b33f6e
am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '73f36d47465da113f39270f4f9cf5d601aa0b585':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:23:19 +00:00
Quddus Chong
930ac01fd7
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
2015-01-16 22:21:34 +00:00
Svet Ganov
2004fdf8e5
am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
...
* commit '830f39ad3cb2c0ff2300c7288e695def37e3b1dd':
Fixing a memory leak: activities are leaked.
2015-01-16 22:18:57 +00:00
Joe Fernandez
90d2aca7f0
am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:15:25 +00:00
Ricardo Cervera
73f36d4746
am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit 'e229751d11692ede7fed3b56472f2d020767b412':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:15:21 +00:00
Svet Ganov
830f39ad3c
Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
2015-01-16 22:12:56 +00:00
Adam Lesinski
42eea270a0
Process base APK
...
The base APK may have resources with configurations that compete
against some splits. The base APK must be involved in the selection
of splits.
Bug:18982001
Change-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8
2015-01-16 14:11:30 -08:00
Chris Wren
4b8c47b861
Merge "Standardize notification IDs in the sysui package."
2015-01-16 22:05:52 +00:00
Quddus Chong
de0a87007b
Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
2015-01-16 22:03:33 +00:00
Joe Fernandez
217d145d49
Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
2015-01-16 21:58:37 +00:00
Chris Wren
d8775100b2
Standardize notification IDs in the sysui package.
...
Use the resource system to assign IDs for notifications,
so that we know there will be no collisions.
Bug: 10671709
Change-Id: I403e89f6ec953f6e2e63520b86e2cd464ebce6b3
2015-01-16 16:19:32 -05:00
Craig Mautner
62ccbb306b
am 62e815bf: am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev
...
* commit '62e815bf7b154fe984e1a2aa8d615a2f04f71785':
More debugging for bug 18201239.
2015-01-16 21:12:53 +00:00
Craig Mautner
62e815bf7b
am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev
...
* commit '02c7c97a62ba9b79e56d1f7e206615e6eaca0689':
More debugging for bug 18201239.
2015-01-16 21:07:13 +00:00
Craig Mautner
02c7c97a62
am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev
...
* commit 'ac70b2d1722fd3ad94b2bf1e8c7695bded56987a':
More debugging for bug 18201239.
2015-01-16 21:01:25 +00:00
Geoff Mendal
fa1849df7b
am eef5734d: (-s ours) am 3891ce73: (-s ours) am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'eef5734d96cd05deab581cdcfebc61533fc25cf6':
Import translations. DO NOT MERGE
2015-01-16 20:58:28 +00:00
Craig Mautner
ac70b2d172
Merge "More debugging for bug 18201239." into lmp-mr1-dev
2015-01-16 20:56:58 +00:00
Craig Mautner
66c4a824b9
More debugging for bug 18201239.
...
Fixes bug 19045133.
Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a
2015-01-16 12:52:54 -08:00
Geoff Mendal
eef5734d96
am 3891ce73: (-s ours) am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '3891ce73206d4cf74c6aec1d5bf1b2b89fb90cb2':
Import translations. DO NOT MERGE
2015-01-16 20:52:29 +00:00
