John Reck
4f1942d999
Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
2014-12-09 23:12:42 +00:00
Ruben Brunk
3ef5033cda
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
2014-12-09 23:09:52 +00:00
Joe Fernandez
6d4818529e
am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
...
* commit 'b35a509d0eb4d9c150630fc6108f4bc039a09043':
:docs studio tips and tricks headings updates
2014-12-09 23:04:13 +00:00
Ricardo Cervera
614889aa1a
am 4a6bafcb: am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '4a6bafcb56d5fe5e2f30626b8836559e722e89a0':
docs: Adding links to material design videos
2014-12-09 22:56:52 +00:00
Joe Fernandez
b35a509d0e
Merge ":docs studio tips and tricks headings updates" into lmp-docs
2014-12-09 22:56:37 +00:00
Ricardo Cervera
4a6bafcb56
am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '12a24dc91fa4de5b897acff9a6435647429040d7':
docs: Adding links to material design videos
2014-12-09 22:49:10 +00:00
Quddus Chong
da125f4f12
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
...
Change-Id: I240feafe4002884dbb2495ffefc599a76b6b7a35
2014-12-09 14:44:05 -08:00
Ricardo Cervera
12a24dc91f
am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '47fa63553bc53d46bc5e1b8873ff81a774d399e7':
docs: Adding links to material design videos
2014-12-09 22:40:55 +00:00
Rich Slogar
5053344bb6
:docs studio tips and tricks headings updates
...
Change-Id: I5453263b575610b6f418569bdf79f73a693c641b
2014-12-09 14:23:18 -08:00
John Reck
dad7d84c04
Teach AssetAtlas about more drawables
...
Bug: 18317479
Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
2014-12-09 14:18:33 -08:00
Ricardo Cervera
47fa63553b
am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '5155840ba091f62ea3079328b25a620089223887':
docs: Adding links to material design videos
2014-12-09 22:16:58 +00:00
Elliott Hughes
a04cd35da0
am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit '0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5':
Fix typo.
2014-12-09 22:09:25 +00:00
smain@google.com
92b6011d95
am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link
...
* commit '9ecc18e2e39348abed90eaadf4319b0614c87097':
revise ADT migration message b/18668828 and fix broken link
2014-12-09 22:09:20 +00:00
smain@google.com
1bc5b1b987
am 325af3a6: am 5d3ea8af: am fe4b4009: am a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs
...
* commit '325af3a659a9e15225f5ec3f62ed4682884f103f':
clarify release notes pages with more specific titles and new links to related docs.
2014-12-09 22:09:14 +00:00
Rich Slogar
6b07b40da5
am 00d635c0: am fbbab546: am d3d4fe4d: am 01ab09c2: docs:studio basics images updates
...
* commit '00d635c0ec07156fd5e98d7c34054a53f0a16545':
docs:studio basics images updates
2014-12-09 22:09:08 +00:00
Joe Fernandez
55677d8ad5
am 33a0828e: am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page
...
* commit '33a0828ea6a9bda7eb2e0367a81d396ede5ace9a':
docs: Change Eclipse deprecation language on sdk/index.html page
2014-12-09 22:09:03 +00:00
smain@google.com
2049cc91e3
am 8503307d: am d7ce432a: am 2317aa2f: am c4a0882a: edits to sdk install instructions.
...
* commit '8503307d67d53f94277ab6b9dbb7f5c59c6aaa85':
edits to sdk install instructions.
2014-12-09 22:08:58 +00:00
smain@google.com
7ee7d3252c
am 664ab723: am aba6a432: am 02cd3a40: am 6ae492e6: changes to deprecate eclipse docs and update migration guide
...
* commit '664ab72332b174829306cb03a4c23ee1442cede3':
changes to deprecate eclipse docs and update migration guide
2014-12-09 22:08:53 +00:00
Derek Sollenberger
497499b1eb
am 04c2bf4f: Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev
...
* commit '04c2bf4f17091eeb07b96bb0571aa6ad3a45d96b':
Remove unnecessary/erroneous reference counting
2014-12-09 22:08:47 +00:00
John Reck
7d74cb6c61
am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
...
* commit '14c436897ca56800a3758008f0631c559a898967':
Fix issue with RNA destruction mid-animation
2014-12-09 22:08:42 +00:00
Elliott Hughes
0aac16bbf1
am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
Fix typo.
2014-12-09 21:34:06 +00:00
smain@google.com
9ecc18e2e3
am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link
...
* commit '4267450e98ae78877cf77a3b28fb4f449b314114':
revise ADT migration message b/18668828 and fix broken link
2014-12-09 21:34:02 +00:00
smain@google.com
325af3a659
am 5d3ea8af: am fe4b4009: am a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs
...
* commit '5d3ea8af3ce46e53362fda3e42a3df6488ba6367':
clarify release notes pages with more specific titles and new links to related docs.
2014-12-09 21:33:31 +00:00
Rich Slogar
00d635c0ec
am fbbab546: am d3d4fe4d: am 01ab09c2: docs:studio basics images updates
...
* commit 'fbbab5467e5e9af8493099b51ab403ffceb4bd92':
docs:studio basics images updates
2014-12-09 21:33:06 +00:00
Joe Fernandez
33a0828ea6
am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page
...
* commit '2a83bc2be699069ca3791d920d0ebfc219baaa70':
docs: Change Eclipse deprecation language on sdk/index.html page
2014-12-09 21:33:02 +00:00
smain@google.com
8503307d67
am d7ce432a: am 2317aa2f: am c4a0882a: edits to sdk install instructions.
...
* commit 'd7ce432ae4ca49f42b23f0bcdc44a091ee96a557':
edits to sdk install instructions.
2014-12-09 21:32:58 +00:00
smain@google.com
664ab72332
am aba6a432: am 02cd3a40: am 6ae492e6: changes to deprecate eclipse docs and update migration guide
...
* commit 'aba6a4327bf175fff57235cca49955a209b0c034':
changes to deprecate eclipse docs and update migration guide
2014-12-09 21:32:52 +00:00
Derek Sollenberger
04c2bf4f17
Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev
2014-12-09 21:27:39 +00:00
Michael Wright
f32bd3c5cd
Don't try to scale the bitmaps for null MediaMetadata.
...
Bug: 18586572
Change-Id: I133e58eeb05136ca82cbd35840b68ebedd9ec365
2014-12-09 13:23:44 -08:00
Ricardo Cervera
5155840ba0
Merge "docs: Adding links to material design videos" into lmp-docs
2014-12-09 21:16:41 +00:00
John Reck
14c436897c
Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
2014-12-09 20:37:17 +00:00
Amith Yamasani
0d2ebc2968
Allow user shutdown broadcasts to be delivered
...
Fixes a regression that prevents the user from being fully shutdown
after being stopped. Wasn't killing all user processes.
Bug: 7462778
Change-Id: Iee7231f7c8a167e8a61549b149294b2dbef071c1
2014-12-09 12:36:57 -08:00
John Reck
c47c98be04
Fix issue with RNA destruction mid-animation
...
Bug: 18521508
Fix an issue where an RNA's native object was destroyed
before the java-side object was started
Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
2014-12-09 12:35:12 -08:00
Jason Monk
7940f55c3a
am 6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev
...
* commit '6f6bc554fad7cc2166ea561a1171bd1ffc961498':
Push inet condition to new MobileSignalControllers
2014-12-09 20:34:55 +00:00
Pavel Zhamaitsiak
bf7b4d9489
am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
...
* commit 'f996d6b7ffcfa813727ba57a30903d1f9e2666da':
Added configuration to determine whether VoLTE requires provisioning.
2014-12-09 20:17:26 +00:00
Pavel Zhamaitsiak
1e989df50d
am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev
...
* commit '49b00a9ca4281b45234d264871428f800083e77f':
IMS: change getMasterValue to getProvisionedValue.
2014-12-09 20:17:20 +00:00
Pavel Zhamaitsiak
d2762ca9bc
am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev
...
* commit '14370741898c8725314d638e58da1ca6e12876b7':
IMS: add ImsConfig api to get volte provisioned value.
2014-12-09 20:17:15 +00:00
Jason Monk
6f6bc554fa
Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev
2014-12-09 20:13:39 +00:00
Pavel Zhamaitsiak
f996d6b7ff
Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
2014-12-09 20:06:55 +00:00
Pavel Zhamaitsiak
49b00a9ca4
Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev
2014-12-09 20:06:35 +00:00
Pavel Zhamaitsiak
1437074189
Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev
2014-12-09 20:05:58 +00:00
Ruben Brunk
f4a637d0be
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
...
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
2014-12-09 11:56:22 -08:00
Elliott Hughes
b034de7eef
am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit '12f100def9e34a554df07f47badc259028ac4c68':
Fix typo.
2014-12-09 19:30:26 +00:00
Elliott Hughes
12f100def9
am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
Fix typo.
2014-12-09 19:22:33 +00:00
Elliott Hughes
e8f6cb065c
Merge "Fix typo." into lmp-docs
2014-12-09 19:16:21 +00:00
smain@google.com
4267450e98
am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link
...
* commit '780a2231ff23d85e56a7a7ddd4a4768d85d6a0c9':
revise ADT migration message b/18668828 and fix broken link
2014-12-09 19:04:30 +00:00
smain@google.com
780a2231ff
am 2023bec7: revise ADT migration message b/18668828 and fix broken link
...
* commit '2023bec7bfed3175819abbe59ebc974872c7981c':
revise ADT migration message b/18668828 and fix broken link
2014-12-09 18:56:20 +00:00
Selim Cinek
e2389908b7
am 24232396: Merge "Fixed accessibility for the pin input view on keyguard." into lmp-mr1-dev
...
* commit '242323969dff16cfe93f67a388754486e7d863c6':
Fixed accessibility for the pin input view on keyguard.
2014-12-09 18:52:19 +00:00
Adrian Roos
a7065ea363
am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
...
* commit 'c3642ef5c8582193f26b3875cebd902253709d5e':
Revert "Add overscan insets to surface frame dimensions in WallpaperService."
2014-12-09 18:52:13 +00:00
Selim Cinek
242323969d
Merge "Fixed accessibility for the pin input view on keyguard." into lmp-mr1-dev
2014-12-09 18:48:52 +00:00