Rich Slogar
fa40f0072f
am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
...
* commit '9c9a3afb95dcac7bf356edf25c8d86187ea59afd':
docs: studio proxy setting setup
docs: studio proxy setup
2015-02-17 22:13:37 +00:00
Rich Sloager
383dacc738
Revert "docs: studio proxy setup"
...
This reverts commit c3e0107ce30aa676011bf7ea0daa9c8db750f024.
Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
2015-02-17 22:10:27 +00:00
Rich Slogar
40132ee15a
Merge "docs: site mipmap folder updates" into lmp-docs
2015-02-17 22:08:42 +00:00
Rich Slogar
3c3b780cae
Merge "docs: studio mipmap update" into lmp-docs
2015-02-17 22:06:46 +00:00
Rich Slogar
9c9a3afb95
am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
...
* commit '8823b93d5c32bb7a8c757022ce055ca53b71171f':
docs: studio proxy setting setup
docs: studio proxy setup
2015-02-17 22:06:21 +00:00
Rich Slogar
8823b93d5c
Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
...
* changes:
docs: studio proxy setting setup
docs: studio proxy setup
2015-02-17 22:02:45 +00:00
Alan Viverette
2a90fa6d94
Fix year picker initial range
...
BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
2015-02-17 21:11:36 +00:00
Oliver Woodman
a40eb5db45
am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
...
* commit '533149d54f881e07f36c2fd62c861942542340fc':
Update ExoPlayer developer guide.
2015-02-17 20:59:50 +00:00
Oliver Woodman
533149d54f
am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
...
* commit 'fe3e71befacc5d0777eb0c7099dd910197cfb6b6':
Update ExoPlayer developer guide.
2015-02-17 20:53:13 +00:00
Rich Slogar
bff1545a3e
am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
...
* commit '8c124744b625f547a5ba15cbb442c605f109bae0':
docs: studio revision 1-1
2015-02-17 20:49:44 +00:00
Oliver Woodman
fe3e71befa
Merge "Update ExoPlayer developer guide." into lmp-docs
2015-02-17 20:48:50 +00:00
Oliver Woodman
a2e9e27f4c
Update ExoPlayer developer guide.
...
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.
Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
2015-02-17 20:47:17 +00:00
Rich Slogar
8c124744b6
am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
...
* commit '76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
docs: studio revision 1-1
2015-02-17 20:42:44 +00:00
Craig Mautner
ca0653a424
Do not make ActivityContainer available to apps. DO NOT MERGE
...
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug 19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-17 20:41:39 +00:00
Rich Slogar
76dd6aa7f9
Merge "docs: studio revision 1-1" into lmp-docs
2015-02-17 20:37:52 +00:00
Rich Slogar
69223702e4
docs: site mipmap folder updates
...
b/12874352
Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
2015-02-17 12:34:35 -08:00
Rich Slogar
cb73fb9044
am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
...
* commit 'd285664399f8f68750e75707a35046e3c9592a2d':
docs: android plugin for gradle revisions page
2015-02-17 20:26:46 +00:00
Rich Slogar
d285664399
am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
...
* commit '4abf87f134fa81460e018bb7130e88639281e1ce':
docs: android plugin for gradle revisions page
2015-02-17 20:19:59 +00:00
Rich Slogar
4abf87f134
Merge "docs: android plugin for gradle revisions page" into lmp-docs
2015-02-17 20:16:09 +00:00
Adrian Roos
42661cba30
Revert "Fixed accessibility for the pin input view on keyguard."
...
Also removes the Klondike from the content description.
This reverts commit c199ef37594b946cb295c29df321e74332ee5408
from change I3dd05fa1714da36795f448718fd70f1cdbfe2584
Bug: 18528774
Change-Id: I8a85076f939a8b78075b5a6322009ebfd78bf8d3
2015-02-17 21:05:57 +01:00
Adrian Roos
024fd0c605
Disable color view animations when stable insets change
...
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug: 19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
2015-02-17 10:24:52 -08:00
David Friedman
efb69b003e
am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
...
* commit '53ec037f9eb0e29f958faa334cf23c35f079eb85':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
2015-02-14 02:50:49 +00:00
David Friedman
53ec037f9e
am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
...
* commit '03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
2015-02-14 02:42:44 +00:00
David Friedman
03efba0e3a
Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
2015-02-14 02:36:34 +00:00
Rich Slogar
38f2242e39
docs: studio mipmap update
...
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
2015-02-13 17:17:41 -08:00
Rich Slogar
0726a31f2b
docs: studio proxy setting setup
...
b/18332702
Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
2015-02-13 16:44:32 -08:00
Rich Slogar
9bd6de1eac
docs: studio revision 1-1
...
Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a
2015-02-13 15:19:31 -08:00
Rich Slogar
3150bb78e6
docs: android plugin for gradle revisions page
...
Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255
2015-02-13 14:58:10 -08:00
Deepanshu Gupta
068499111c
am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
...
* commit 'ad879adb65ffa577844738522ab6d7d30aba2ead':
Add Asset management support for fonts.
2015-02-13 22:38:23 +00:00
Diego Perez
a912fedbc5
am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
...
* commit '98c3461acd6699ab0448f1785909d0d39cd61b5a':
Do not paint shadow if outside of the clip area
2015-02-13 22:38:17 +00:00
Deepanshu Gupta
4e47416012
am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
...
* commit '12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
Changes made by intelliJ 14.1
2015-02-13 22:38:07 +00:00
Deepanshu Gupta
ad879adb65
Merge "Add Asset management support for fonts." into lmp-dev
2015-02-13 22:34:36 +00:00
Diego Perez
98c3461acd
Merge "Do not paint shadow if outside of the clip area" into lmp-dev
2015-02-13 22:34:16 +00:00
Deepanshu Gupta
12c9e4980e
Merge "Changes made by intelliJ 14.1" into lmp-dev
2015-02-13 22:33:48 +00:00
David Friedman
d350c5ced5
This file is misplaced, and serves no purpose. I am sending it to oblivion.
...
Change-Id: I91ed7bc228849f3181591357037b368b4b261eee
2015-02-12 21:30:59 -08:00
Svetoslav
27ad2e95b4
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
...
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
2015-02-13 01:59:11 +00:00
Ruben Brunk
d2ccbd43d2
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
2015-02-13 01:22:26 +00:00
Andrew Solovay
c860242cc1
docs: Noted that purchaseToken is long and cannot be truncated.
...
Noted in reference and integration doc that the token for Google Play
purchases may be up to 1,000 chars long, and the entire token must
be returned (not abbreviated or truncated) to any method that needs
it.
See first comment for doc stage location.
bug: 19099521
Change-Id: I0a0f187293ea522c218f6c3287b4c36ee6725a90
2015-02-12 17:05:43 -08:00
Luan Nguyen
474746c7b0
am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
...
automerge: fe2c687
* commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
docs: Update device art generator to include Wear generic devices.
2015-02-13 00:16:48 +00:00
Luan Nguyen
71cf2b6d53
am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
...
automerge: e0306bb
* commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-13 00:15:09 +00:00
Luan Nguyen
b14aec1b95
am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
...
automerge: 946bf2d
* commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (7461154, 12765600)
2015-02-13 00:13:35 +00:00
John Spurlock
f45e5dbf59
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
2015-02-12 22:52:13 +00:00
Jim Miller
b2ff8d9a3e
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
2015-02-12 21:48:11 +00:00
Ruben Brunk
259f3d90b8
camera2: Fix legacy scaling factor application.
...
Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
2015-02-12 13:27:26 -08:00
Luan Nguyen
fe2c687b97
am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
...
* commit '2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
docs: Update device art generator to include Wear generic devices.
2015-02-12 19:13:47 +00:00
Luan Nguyen
2ea209ab4c
am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
...
* commit '8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
docs: Update device art generator to include Wear generic devices.
2015-02-12 19:07:47 +00:00
Luan Nguyen
8d0df9b891
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
2015-02-12 19:01:03 +00:00
Jeremy Joslin
20be0e25ba
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
2015-02-12 18:34:03 +00:00
John Spurlock
f370177e94
NoMan: Initialize filter value reported to listeners.
...
In addition to relying on change callbacks.
Bug: 19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
2015-02-12 13:29:37 -05:00
Luan Nguyen
e0306bbece
am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
...
* commit 'e726495a269b48f9b94fa9e545f84e79d587a282':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-12 17:35:43 +00:00