184573 Commits

Author SHA1 Message Date
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
Vinit Deshpande
d64ff3cee5 am "am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
254dc28 am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
2015-03-15 13:38:17 -07:00
Vinit Deshpande
3e6036c8d3 am "am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
f08036f am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
2015-03-15 13:38:16 -07:00
Vinit Deshpande
17adc545ba am "am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a1b14e3 am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
2015-03-15 13:38:15 -07:00
Vinit Deshpande
9839c53e15 am "am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d6d8eb3 am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
2015-03-15 13:38:14 -07:00
Vinit Deshpande
5ff1c3c01c am "am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
81918ce am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
2015-03-15 13:38:13 -07:00
Vinit Deshpande
9f51b023d7 am "am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
07141ad am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev
2015-03-15 13:38:12 -07:00
Vinit Deshpande
3253240d65 am "am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
dc31e4f am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
2015-03-15 13:38:11 -07:00
Vinit Deshpande
77aacdb321 am "am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
5bebf6c am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev
2015-03-15 13:38:10 -07:00
Vinit Deshpande
cc13482366 am "am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
2ef7062 am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev
2015-03-15 13:38:08 -07:00
Vinit Deshpande
78afa125f9 am "am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java."
merged from goog/mirror-m-wireless-internal-release
47baf09 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
2015-03-15 13:38:07 -07:00
Vinit Deshpande
672ddce597 am "am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a48b550 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
2015-03-15 13:38:06 -07:00
Vinit Deshpande
2769e10ef5 am "am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
ae4456c am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
2015-03-15 13:38:06 -07:00
Vinit Deshpande
f74ee6d998 am "am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
56bc490 am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev
2015-03-15 13:38:04 -07:00
Vinit Deshpande
9f7ba5bb17 am "am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
aed4ec4 am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev
2015-03-15 13:38:03 -07:00
Vinit Deshpande
c2def4802f am "am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b11af58 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
2015-03-15 13:38:02 -07:00
Vinit Deshpande
3ba9c45ffb am "am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
1b89459 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev
2015-03-15 13:38:01 -07:00
Vinit Deshpande
af20997eed am "am bac8e12e: Move layer-list to be top-level element in seek bar progress"
merged from goog/mirror-m-wireless-internal-release
79cc73a am bac8e12e: Move layer-list to be top-level element in seek bar progress
2015-03-15 13:38:00 -07:00
Vinit Deshpande
8613f83c55 am "am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b9f0cae am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
2015-03-15 13:37:59 -07:00
Vinit Deshpande
fc71a9be9f am "am 80252a92: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
33e7e42 am 80252a92: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
2015-03-15 13:37:58 -07:00
Vinit Deshpande
31de475a4e am "am 721a9578: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b1613a0 am 721a9578: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev
2015-03-15 13:37:57 -07:00
Vinit Deshpande
2ce334dfe3 am "am c3a043cf: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS."
merged from goog/mirror-m-wireless-internal-release
722491d am c3a043cf: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
2015-03-15 13:37:56 -07:00
Vinit Deshpande
a86f0741c7 am "get channel list from driver for SoftAP channel selection"
merged from goog/mirror-m-wireless-internal-release
18ae1d2 get channel list from driver for SoftAP channel selection
2015-03-15 13:37:54 -07:00
Vinit Deshpande
fc19120fc7 am "Revert "Initial Passpoint code.""
merged from goog/mirror-m-wireless-internal-release
5d7768f Revert "Initial Passpoint code."
2015-03-15 13:37:52 -07:00
Vinit Deshpande
a0127fd502 am "am d7310bd1: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
49c2bc3 am d7310bd1: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
2015-03-15 13:37:51 -07:00
Vinit Deshpande
b8b377fce7 am "am fdb2112b: camera2: limit flexYUV array size in DngCreator"
merged from goog/mirror-m-wireless-internal-release
2e6eede am fdb2112b: camera2: limit flexYUV array size in DngCreator
2015-03-15 13:37:50 -07:00
Vinit Deshpande
bcee28d9e2 am "am 39ae0547: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
8ad51b5 am 39ae0547: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
2015-03-15 13:37:49 -07:00
Vinit Deshpande
49f9d60d0d am "am ded133c4: Fix broken activation of the selected view in accessibility mode."
merged from goog/mirror-m-wireless-internal-release
f855a3c am ded133c4: Fix broken activation of the selected view in accessibility mode.
2015-03-15 13:37:48 -07:00
Vinit Deshpande
e7e270e260 am "am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860"
merged from goog/mirror-m-wireless-internal-release
be876df am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860
2015-03-15 13:37:46 -07:00
Vinit Deshpande
22ac17f43d am "am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
15b7627 am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
2015-03-15 13:37:45 -07:00
Vinit Deshpande
acfbca09d8 am "am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
c1c9c31 am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
2015-03-15 13:37:44 -07:00
Vinit Deshpande
96b31ed3f1 am "am dcce25a9: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635"
merged from goog/mirror-m-wireless-internal-release
cd97a64 am dcce25a9: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635
2015-03-15 13:37:43 -07:00
Vinit Deshpande
5c07f4b69e am "am 346a9a2f: am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da"
merged from goog/mirror-m-wireless-internal-release
d58870e am 346a9a2f: am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da
2015-03-15 13:37:42 -07:00
Vinit Deshpande
ae4331af40 am "am 580937fc: am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447"
merged from goog/mirror-m-wireless-internal-release
2a051ef am 580937fc: am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447
2015-03-15 13:37:41 -07:00
Vinit Deshpande
3439d0d612 am "am 1575ca6e: am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd"
merged from goog/mirror-m-wireless-internal-release
da30fd7 am 1575ca6e: am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd
2015-03-15 13:37:40 -07:00
Vinit Deshpande
1a7be35fdb am "am 3548de60: am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
223e625 am 3548de60: am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
2015-03-15 13:37:39 -07:00
Vinit Deshpande
77145f5605 am "am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation"
merged from goog/mirror-m-wireless-internal-release
65bfa6f am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
2015-03-15 13:37:38 -07:00
Vinit Deshpande
b016668328 am "am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
617ae0d am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
2015-03-15 13:37:37 -07:00
Vinit Deshpande
aabda3fff8 am "am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b70233d am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
2015-03-15 13:37:36 -07:00
Vinit Deshpande
dfe4b96cbd am "am b2dd5cb9: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
8df98bb am b2dd5cb9: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
2015-03-15 13:37:35 -07:00
Vinit Deshpande
518ceb4961 am "am 3c68ca2f: Fix expandSettingsPanel status bar call"
merged from goog/mirror-m-wireless-internal-release
402e5bc am 3c68ca2f: Fix expandSettingsPanel status bar call
2015-03-15 13:37:34 -07:00
Vinit Deshpande
8b23eec2bd am "am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d52eef5 am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
2015-03-15 13:37:33 -07:00
Vinit Deshpande
1c5987a2df am "am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
068560a am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
2015-03-15 13:37:32 -07:00
Vinit Deshpande
2b517e3a78 am "am e9e2707f: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
d498a8e am e9e2707f: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs
2015-03-15 13:37:31 -07:00
Vinit Deshpande
ff64c4974c am "am 1b5a0fb6: am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
eed98b4 am 1b5a0fb6: am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
2015-03-15 13:37:30 -07:00
Vinit Deshpande
68a5d4a13b am "am 9ad282fd: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text"
merged from goog/mirror-m-wireless-internal-release
f96fc17 am 9ad282fd: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text
2015-03-15 13:37:29 -07:00
Vinit Deshpande
68c4550a68 am "am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
c9466d4 am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
2015-03-15 13:37:28 -07:00
Vinit Deshpande
4035f91360 am "am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
94e5994 am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev
2015-03-15 13:37:27 -07:00
Vinit Deshpande
01c4f7e1d7 am "am b71ac193: Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
7a361ce am b71ac193: Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev
2015-03-15 13:37:26 -07:00