185089 Commits

Author SHA1 Message Date
Vinit Deshpande
df84b4945a am "am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943"
merged from goog/mirror-m-wireless-internal-release
47fb4d5 am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943
2015-03-15 13:39:09 -07:00
Vinit Deshpande
911420da07 am "am f82c88e2: am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge: 5f31276"
merged from goog/mirror-m-wireless-internal-release
3b9921c am f82c88e2: am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge: 5f31276
2015-03-15 13:39:08 -07:00
Vinit Deshpande
69d1f77531 am "am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01"
merged from goog/mirror-m-wireless-internal-release
8e1032a am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01
2015-03-15 13:39:07 -07:00
Vinit Deshpande
49fed1e021 am "am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc"
merged from goog/mirror-m-wireless-internal-release
f173470 am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc
2015-03-15 13:39:06 -07:00
Vinit Deshpande
ca343cca56 am "am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989"
merged from goog/mirror-m-wireless-internal-release
872efa6 am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989
2015-03-15 13:39:05 -07:00
Vinit Deshpande
e8d5ef6068 am "am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604"
merged from goog/mirror-m-wireless-internal-release
0c4496e am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604
2015-03-15 13:39:04 -07:00
Vinit Deshpande
89821101a6 am "am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d0e4004 am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
2015-03-15 13:39:03 -07:00
Vinit Deshpande
ce54b58aa7 am "am a94e4297: (-s ours) Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
2015-03-15 13:39:02 -07:00
Vinit Deshpande
3834ce9790 am "am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
12c2d3f am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
2015-03-15 13:39:01 -07:00
Vinit Deshpande
9003482573 am "am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
bed5a61 am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
2015-03-15 13:39:00 -07:00
Vinit Deshpande
86aa273074 am "am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00"
merged from goog/mirror-m-wireless-internal-release
6490ad4 am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00
2015-03-15 13:38:59 -07:00
Vinit Deshpande
818de6f2ae am "am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d"
merged from goog/mirror-m-wireless-internal-release
c987508 am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d
2015-03-15 13:38:58 -07:00
Vinit Deshpande
cc2470a0b8 am "am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545"
merged from goog/mirror-m-wireless-internal-release
e343c3c am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545
2015-03-15 13:38:57 -07:00
Vinit Deshpande
2cf29b6322 am "am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9"
merged from goog/mirror-m-wireless-internal-release
b4f8092 am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9
2015-03-15 13:38:56 -07:00
Vinit Deshpande
7f2fb2a392 am "am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0"
merged from goog/mirror-m-wireless-internal-release
4e1206b am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0
2015-03-15 13:38:55 -07:00
Vinit Deshpande
60fbac2b0c am "am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991"
merged from goog/mirror-m-wireless-internal-release
06aad89 am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991
2015-03-15 13:38:54 -07:00
Vinit Deshpande
2ca5bb97ac am "am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed"
merged from goog/mirror-m-wireless-internal-release
2e7db07 am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed
2015-03-15 13:38:53 -07:00
Vinit Deshpande
331d817e64 am "am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416"
merged from goog/mirror-m-wireless-internal-release
88542b8 am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416
2015-03-15 13:38:52 -07:00
Vinit Deshpande
f27d5c64d4 am "am 024fd0c6: Disable color view animations when stable insets change"
merged from goog/mirror-m-wireless-internal-release
d7a4f64 am 024fd0c6: Disable color view animations when stable insets change
2015-03-15 13:38:51 -07:00
Vinit Deshpande
d4ef0d9319 am "am 27ad2e95: Accessibility: Ensure fresh accessilbity focused and input focused nodes."
merged from goog/mirror-m-wireless-internal-release
610f036 am 27ad2e95: Accessibility: Ensure fresh accessilbity focused and input focused nodes.
2015-03-15 13:38:50 -07:00
Vinit Deshpande
4b0779f115 am "am d2ccbd43: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
598aa3d am d2ccbd43: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
2015-03-15 13:38:48 -07:00
Vinit Deshpande
f09fd36b3c am "am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687"
merged from goog/mirror-m-wireless-internal-release
3118ae8 am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687
2015-03-15 13:38:47 -07:00
Vinit Deshpande
e78c79c4c6 am "am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb"
merged from goog/mirror-m-wireless-internal-release
fd8069c am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb
2015-03-15 13:38:46 -07:00
Vinit Deshpande
eaf4412f6f am "am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d"
merged from goog/mirror-m-wireless-internal-release
df062f6 am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d
2015-03-15 13:38:45 -07:00
Vinit Deshpande
e5ad60be6f am "am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
dfc0a77 am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
2015-03-15 13:38:44 -07:00
Vinit Deshpande
0f3ac2a644 am "am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
2d5b218 am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
2015-03-15 13:38:43 -07:00
Vinit Deshpande
7360f4418e am "am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
1f96024 am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
2015-03-15 13:38:42 -07:00
Vinit Deshpande
aeb47c6768 am "am c70d0e71: Fix the javadocs for lock task mode intents."
merged from goog/mirror-m-wireless-internal-release
128b21e am c70d0e71: Fix the javadocs for lock task mode intents.
2015-03-15 13:38:41 -07:00
Vinit Deshpande
2dda75fbb7 am "am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
75f4217 am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
2015-03-15 13:38:40 -07:00
Vinit Deshpande
9daca1852c am "am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
be828a3 am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
2015-03-15 13:38:39 -07:00
Vinit Deshpande
26bcb5eac9 am "am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
22d1f8c am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
2015-03-15 13:38:38 -07:00
Vinit Deshpande
f76afa9710 am "am 3292c0e2: Merge "Stop active media projections on user switch." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a79a38b am 3292c0e2: Merge "Stop active media projections on user switch." into lmp-mr1-dev
2015-03-15 13:38:37 -07:00
Vinit Deshpande
6b8b63c968 am "am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
ab3356d am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
2015-03-15 13:38:36 -07:00
Vinit Deshpande
a0c3c1e343 am "am c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
5984dab am c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
2015-03-15 13:38:35 -07:00
Vinit Deshpande
a4bb588816 am "am 64ce5f8f: GpsLocationProvider: Read data enabled status from TelephonyManager."
merged from goog/mirror-m-wireless-internal-release
438a92c am 64ce5f8f: GpsLocationProvider: Read data enabled status from TelephonyManager.
2015-03-15 13:38:34 -07:00
Vinit Deshpande
15894c645b am "am 3bb5fdc7: (-s ours) Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
2015-03-15 13:38:33 -07:00
Vinit Deshpande
03268b8b1f am "am 696b68c4: am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
5a28b16 am 696b68c4: am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
2015-03-15 13:38:32 -07:00
Vinit Deshpande
3e98fc346c am "am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
09a41dc am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
2015-03-15 13:38:31 -07:00
Vinit Deshpande
0260fe9ca0 am "am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
face792 am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
2015-03-15 13:38:30 -07:00
Vinit Deshpande
154e83f101 am "am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779"
merged from goog/mirror-m-wireless-internal-release
5788e25 am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779
2015-03-15 13:38:28 -07:00
Vinit Deshpande
5fec2a7c55 am "am 618e420a: Doze: pulse less often."
merged from goog/mirror-m-wireless-internal-release
45c30574 am 618e420a: Doze: pulse less often.
2015-03-15 13:38:27 -07:00
Vinit Deshpande
29a76e8faf am "am c73cfa0f: Accessibiltiy: missed update to the previous patch."
merged from goog/mirror-m-wireless-internal-release
0438c5e am c73cfa0f: Accessibiltiy: missed update to the previous patch.
2015-03-15 13:38:26 -07:00
Vinit Deshpande
16bc16c61f am "am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
28972ed am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
2015-03-15 13:38:25 -07:00
Vinit Deshpande
2e26796fcd am "am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
813ac73 am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
2015-03-15 13:38:24 -07:00
Vinit Deshpande
11dd4a5d75 am "am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a40e069 am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
2015-03-15 13:38:23 -07:00
Vinit Deshpande
dac6b9a07d am "am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
7638eca am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
2015-03-15 13:38:22 -07:00
Vinit Deshpande
08d471626b am "am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d085a7b am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
2015-03-15 13:38:21 -07:00
Vinit Deshpande
4bdf5d254a am "am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
cd6bf02 am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
2015-03-15 13:38:20 -07:00
Vinit Deshpande
5b28530265 am "am 991db77a: Only request IME if password view is showing"
merged from goog/mirror-m-wireless-internal-release
d0579b1 am 991db77a: Only request IME if password view is showing
2015-03-15 13:38:19 -07:00
Vinit Deshpande
6e15341ca8 am "am 07c745b5: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
3c75d26 am 07c745b5: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
2015-03-15 13:38:18 -07:00