OSDN Git Service
Joe Fernandez [Sat, 31 Jan 2015 00:29:37 +0000 (00:29 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge:
3548de6
automerge:
95fa882
* commit '
95fa88250a1957c7adfbd35d52f62e42cbe03df6':
docs: studio emulator platform update
Joe Fernandez [Sat, 31 Jan 2015 00:25:04 +0000 (00:25 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
automerge:
3548de6
* commit '
3548de60735a79d3e7087c26ae491a7f38da5b4d':
docs: studio emulator platform update
Joe Fernandez [Sat, 31 Jan 2015 00:14:39 +0000 (00:14 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
5c37c8e66227b15d471047e7c4c986cf3c67876a':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:41:10 +0000 (23:41 +0000)]
am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
d801a1238392b8c7a8e0131cee89370143363046':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs
Jon Larimer [Fri, 30 Jan 2015 22:40:17 +0000 (22:40 +0000)]
am
3a6d8f54: 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
* commit '
3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:33:13 +0000 (22:33 +0000)]
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
* commit '
90d5bd8daab404afc50470f5c19ea725bd2466fe':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:24:43 +0000 (22:24 +0000)]
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
* commit '
feb362a5d194b30226caf2efbaae77991007c65c':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:24:25 +0000 (22:24 +0000)]
am
712d5b3d: am
147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
* commit '
712d5b3d582dfe8f7fb855ba98704c98e9441836':
[DS] Correct the access method for telephony system property
Jon Larimer [Fri, 30 Jan 2015 22:18:34 +0000 (22:18 +0000)]
am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:17:42 +0000 (22:17 +0000)]
am
147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
* commit '
147b6a3522b7032ede24101f5ac32ec7d7afa9e9':
[DS] Correct the access method for telephony system property
Jinsuk Kim [Fri, 30 Jan 2015 22:15:00 +0000 (22:15 +0000)]
am
42e785fb: am
3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
* commit '
42e785fbf7dfa50096275cf1e6233247e9fc15f7':
Revert "CEC: Let playback device switch TV input after bootup"
Jon Larimer [Fri, 30 Jan 2015 22:11:56 +0000 (22:11 +0000)]
am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:09:37 +0000 (22:09 +0000)]
Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
Jinsuk Kim [Fri, 30 Jan 2015 22:06:09 +0000 (22:06 +0000)]
am
3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
* commit '
3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
Revert "CEC: Let playback device switch TV input after bootup"
Jon Larimer [Fri, 30 Jan 2015 22:01:50 +0000 (22:01 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
545dd853bffbf778a0a44816ac6ed381b13f2158':
Fix build breakage in older branches by avoiding <> notation
Jinsuk Kim [Fri, 30 Jan 2015 22:00:39 +0000 (22:00 +0000)]
Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
Jinsuk Kim [Fri, 30 Jan 2015 21:58:18 +0000 (21:58 +0000)]
Revert "CEC: Let playback device switch TV input after bootup"
This reverts commit
8913a0e1e8559d96e82b1ff408dd312ed279021b.
Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
Jon Larimer [Fri, 30 Jan 2015 21:54:31 +0000 (21:54 +0000)]
am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:44:17 +0000 (21:44 +0000)]
am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
159aa73574804967aded45d06b70df5a8dd64a58':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:28:59 +0000 (21:28 +0000)]
am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
d403180997898c98f0be15b810c4c9dd9002f92c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
48c95c4370533bf27e537cbca1e64d060a016c5f':
Fix build breakage in older branches by avoiding <> notation
Jason Monk [Fri, 30 Jan 2015 19:27:06 +0000 (19:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge:
b2dd5cb
automerge:
d2f15ec
* commit '
d2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 19:25:20 +0000 (19:25 +0000)]
Fix expandSettingsPanel status bar call automerge:
3c68ca2
automerge:
f388249
* commit '
f38824928cf586124ffc6dc7a85c7f8603f77c5a':
Fix expandSettingsPanel status bar call
Jason Monk [Fri, 30 Jan 2015 18:48:15 +0000 (18:48 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
automerge:
b2dd5cb
* commit '
b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 18:46:31 +0000 (18:46 +0000)]
Fix expandSettingsPanel status bar call
automerge:
3c68ca2
* commit '
3c68ca2feab6d3cd09c297ddc2e77af67694feec':
Fix expandSettingsPanel status bar call
Jason Monk [Fri, 30 Jan 2015 18:27:52 +0000 (18:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
Jason Monk [Fri, 30 Jan 2015 18:02:27 +0000 (13:02 -0500)]
Fix QS bluetooth tile accessibility issue
Bluetooth tile was not announcing its state when the top half was
clicked. This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information. So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.
Bug:
19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
Jason Monk [Fri, 30 Jan 2015 16:30:29 +0000 (11:30 -0500)]
Fix expandSettingsPanel status bar call
Use the same mechanism as the two finger gesture to get it to open
correctly.
Bug:
19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
Lorenzo Colitti [Fri, 30 Jan 2015 15:56:00 +0000 (15:56 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration." automerge:
c565a56
automerge:
5b392ee
* commit '
5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Fri, 30 Jan 2015 15:54:45 +0000 (15:54 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge:
fba459d
automerge:
786deba
* commit '
786deba636618fcf530e42340b0e5d683c5af74c':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Lorenzo Colitti [Fri, 30 Jan 2015 12:15:39 +0000 (12:15 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration."
automerge:
c565a56
* commit '
c565a5675ac33d97d5c1caed7a5629412997fb4a':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Fri, 30 Jan 2015 12:13:38 +0000 (12:13 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
automerge:
fba459d
* commit '
fba459d3457a0cb61bcb657c9fafadf0ccea27a9':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Lorenzo Colitti [Fri, 30 Jan 2015 07:07:48 +0000 (07:07 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration."
Lorenzo Colitti [Fri, 30 Jan 2015 07:00:38 +0000 (07:00 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
Alan Viverette [Fri, 30 Jan 2015 03:32:33 +0000 (03:32 +0000)]
am
f607fa6b: am
d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
* commit '
f607fa6b73019998588e613aa2ae8ee97958cee7':
Avoid bug in LinearLayout measurement
Alan Viverette [Fri, 30 Jan 2015 03:20:44 +0000 (03:20 +0000)]
am
d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
* commit '
d38cc749215c0e41bcb06703066c379de83d91e4':
Avoid bug in LinearLayout measurement
Alan Viverette [Fri, 30 Jan 2015 03:15:06 +0000 (03:15 +0000)]
Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
Legler Wu [Thu, 29 Jan 2015 07:07:39 +0000 (15:07 +0800)]
[DS] Correct the access method for telephony system property
Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC
Bug:
18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
Christopher Ferris [Fri, 30 Jan 2015 02:40:09 +0000 (02:40 +0000)]
am
fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
automerge:
5d0cf917
* commit '
5d0cf917c3e21490ed709e27893b9f02e997cf52':
Fix wrap property creation when truncating.
Christopher Ferris [Fri, 30 Jan 2015 02:33:34 +0000 (02:33 +0000)]
am
fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
* commit '
fd41feee6b909670010da79a0800c1aa2ce44255':
Fix wrap property creation when truncating.
Christopher Ferris [Fri, 30 Jan 2015 02:29:26 +0000 (02:29 +0000)]
Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
Rich Slogar [Fri, 30 Jan 2015 02:13:45 +0000 (02:13 +0000)]
am
4649dcd7: am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge:
e9e2707
* commit '
4649dcd7c41aa3893ff0e52c5142a7d95c678b7b':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 02:13:40 +0000 (02:13 +0000)]
am
b2788236: am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs automerge:
1b5a0fb
* commit '
b27882361ec5b0602d55783131ba28942b318a77':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 02:13:34 +0000 (02:13 +0000)]
am
4ca01ef2: am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text automerge:
9ad282f
* commit '
4ca01ef21d7eacf398989740c6985a97891111e6':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 02:10:53 +0000 (02:10 +0000)]
am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
automerge:
e9e2707
* commit '
e9e2707feffd01c39252afcdea15523c9883a7ea':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 02:09:16 +0000 (02:09 +0000)]
am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
automerge:
1b5a0fb
* commit '
1b5a0fb681c3e2c1aad2d8a9b5313c2bd1b93220':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 02:07:44 +0000 (02:07 +0000)]
am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
automerge:
9ad282f
* commit '
9ad282fd73141685a2fc0d3474676ab10ddc4e1f':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:58:22 +0000 (01:58 +0000)]
am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:53:53 +0000 (01:53 +0000)]
am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:53:48 +0000 (01:53 +0000)]
am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:49:12 +0000 (01:49 +0000)]
am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
6ccb72e685da6769d43545c21182ca44e039da3e':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:44:43 +0000 (01:44 +0000)]
am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
a303121168f1e3cfe62f6836a38ba1a33f3e336d':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:44:39 +0000 (01:44 +0000)]
am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
e4249f29ea56f35aab1337323a0e55992ee9247f':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:41:58 +0000 (01:41 +0000)]
am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
e0063faa8707e2424a33625aaf2228540fa67e85':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:37:23 +0000 (01:37 +0000)]
am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
b86c3b80db09da85b50c1809520bbf893cb83d93':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:37:21 +0000 (01:37 +0000)]
am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:32:17 +0000 (01:32 +0000)]
Merge "docs: linux requirements update" into lmp-docs
Scott Rowe [Fri, 30 Jan 2015 01:30:43 +0000 (01:30 +0000)]
Merge "docs: Card View for Android TV training" into lmp-docs
Alan Viverette [Fri, 30 Jan 2015 01:21:21 +0000 (17:21 -0800)]
Avoid bug in LinearLayout measurement
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.
Bug:
19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
Amit Mahajan [Fri, 30 Jan 2015 01:03:30 +0000 (01:03 +0000)]
am
d492aa08: am
45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
* commit '
d492aa08206d21ba2e5ba533532630e5abe0bffe':
Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
Amit Mahajan [Fri, 30 Jan 2015 00:56:35 +0000 (00:56 +0000)]
am
45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
* commit '
45446c632162eb61a213815363149175732de78d':
Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
Amit Mahajan [Fri, 30 Jan 2015 00:52:49 +0000 (00:52 +0000)]
Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
Sailesh Nepal [Fri, 30 Jan 2015 00:41:23 +0000 (00:41 +0000)]
am
0d30c930: am
38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev
* commit '
0d30c930c39fb48bbec68158dc9a39d4fbfdff9f':
Fix crash when making emergency calls
Sailesh Nepal [Fri, 30 Jan 2015 00:36:07 +0000 (00:36 +0000)]
am
38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev
* commit '
38710f03c92a57ec00830e146a0714254c635405':
Fix crash when making emergency calls
Sailesh Nepal [Fri, 30 Jan 2015 00:31:11 +0000 (00:31 +0000)]
Merge "Fix crash when making emergency calls" into lmp-mr1-dev
Christopher Tate [Fri, 30 Jan 2015 00:17:19 +0000 (00:17 +0000)]
am
9b36d111: am
b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
* commit '
9b36d1117a2f0eb0402b0f9dda8bc5d94b110061':
Don't run full-data backups when backup is disabled
Christopher Ferris [Fri, 30 Jan 2015 00:14:17 +0000 (00:14 +0000)]
am
e7a69cbf: am
dbd03924: Merge "Fix wrap property creation when truncating."
* commit '
e7a69cbf920565b4b428459198fd53f193080796':
Fix wrap property creation when truncating.
Christopher Tate [Fri, 30 Jan 2015 00:11:59 +0000 (00:11 +0000)]
am
b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
* commit '
b71ac193087dc768a25cebb0f06f0ccbb66e8ba9':
Don't run full-data backups when backup is disabled
Christopher Tate [Fri, 30 Jan 2015 00:06:17 +0000 (00:06 +0000)]
Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev
Christopher Ferris [Thu, 29 Jan 2015 01:56:32 +0000 (17:56 -0800)]
Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.
Bug:
19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
(cherry picked from commit
e32df45fe1a8cb7286bfdad392a0d36e0ddcf8e7)
Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
Christopher Ferris [Thu, 29 Jan 2015 23:51:16 +0000 (23:51 +0000)]
am
dbd03924: Merge "Fix wrap property creation when truncating."
* commit '
dbd03924d83ab03e6e8e45d1d041dc8d162180cf':
Fix wrap property creation when truncating.
Christopher Tate [Thu, 29 Jan 2015 21:17:37 +0000 (13:17 -0800)]
Don't run full-data backups when backup is disabled
If the scheduled job fires but backup is disabled or the device is
not yet provisioned (i.e. has not yet finished going through setup),
bow out gracefully without running any backup operations. Also, even
if a backup is directly invoked (e.g. via adb), verify again right
before we start collecting app data, and abandon the operation in
that path as well.
(This is redundant; having only the latter test would suffice, but
this lets us distinguish in the logging more easily.)
Finally, make sure that if we were waiting on setup before permitting
backup operations to begin, that we startup the full-data scheduling
as well as the [separate] key/value scheduling.
Bug
19197062
Change-Id: I3d8fb650c50f946d8ed7ac7170df361c707f2528
Christopher Ferris [Thu, 29 Jan 2015 23:41:05 +0000 (23:41 +0000)]
Merge "Fix wrap property creation when truncating."
Raph Levien [Thu, 29 Jan 2015 23:25:14 +0000 (23:25 +0000)]
am
61ff4d1d: am
d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
* commit '
61ff4d1debe013e9f81bb05f59356b133b6e4922':
Use constants instead of resources for ellipsis.
Raph Levien [Thu, 29 Jan 2015 23:17:01 +0000 (23:17 +0000)]
am
d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
* commit '
d24047dcfed3fb7c913a0a5950c9f48ce3d49b9e':
Use constants instead of resources for ellipsis.
Raph Levien [Thu, 29 Jan 2015 23:04:14 +0000 (23:04 +0000)]
Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
Igor Viarheichyk [Thu, 11 Sep 2014 22:07:05 +0000 (15:07 -0700)]
Use constants instead of resources for ellipsis.
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.
(cherry-pick of
ed0daa93e48d38e54a7ad1c99c461510a4c07599.)
Bug:
18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
Jinsuk Kim [Thu, 29 Jan 2015 22:44:51 +0000 (22:44 +0000)]
am
7bf039b6: am
9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev
* commit '
7bf039b67c89ac07a1b90d048bf1e4ff0e121ab8':
CEC: Discard key event to itself
Jinsuk Kim [Thu, 29 Jan 2015 22:39:57 +0000 (22:39 +0000)]
am
9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev
* commit '
9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895':
CEC: Discard key event to itself
Jinsuk Kim [Thu, 29 Jan 2015 22:37:01 +0000 (22:37 +0000)]
am
eb2c4a07: am
dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
* commit '
eb2c4a07a118bb6f41455ffd14f35086298675cd':
CEC: Do null/empty check against the parameter for checkRecordSource()
Jinsuk Kim [Thu, 29 Jan 2015 22:36:55 +0000 (22:36 +0000)]
am
1ebbe916: am
3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
* commit '
1ebbe9165842707fd575ea61b8158463f93c35be':
CEC: Add CEC device upon receiving <Report Physical Address>
Raph Levien [Thu, 29 Jan 2015 22:36:46 +0000 (22:36 +0000)]
am
2ed9a7e5: am
af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
* commit '
2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627':
Refine resolution order for typeface and fontFamily
Jinsuk Kim [Thu, 29 Jan 2015 22:33:42 +0000 (22:33 +0000)]
Merge "CEC: Discard key event to itself" into lmp-mr1-dev
Jinsuk Kim [Thu, 29 Jan 2015 07:38:36 +0000 (16:38 +0900)]
CEC: Discard key event to itself
Should discard keyevents if the target address is the device itself.
Bug:
19188660
Change-Id: Id47d79c996f60c9d90540f28c4b2509976d2f378
Jinsuk Kim [Thu, 29 Jan 2015 22:26:01 +0000 (22:26 +0000)]
am
dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
* commit '
dbdaea0c6d44ead142f42ac060af2f5cd7f942ac':
CEC: Do null/empty check against the parameter for checkRecordSource()
Jinsuk Kim [Thu, 29 Jan 2015 22:25:57 +0000 (22:25 +0000)]
am
3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
* commit '
3f923474248e24706e7977a7512b0a35cff835a7':
CEC: Add CEC device upon receiving <Report Physical Address>
Raph Levien [Thu, 29 Jan 2015 22:25:51 +0000 (22:25 +0000)]
am
af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
* commit '
af461e12a12dba8fc544fa373831368ba2c18096':
Refine resolution order for typeface and fontFamily
Jinsuk Kim [Thu, 29 Jan 2015 22:22:30 +0000 (22:22 +0000)]
Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
Jinsuk Kim [Thu, 29 Jan 2015 22:21:53 +0000 (22:21 +0000)]
Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
Raph Levien [Thu, 29 Jan 2015 22:10:59 +0000 (22:10 +0000)]
Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
Sanket Padawe [Thu, 29 Jan 2015 21:56:04 +0000 (21:56 +0000)]
am
60e4edfb: am
5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
* commit '
60e4edfb94fd744001b4c7013a89ef4abb311f97':
Suppress logging to avoid showing phone no.
Sanket Padawe [Thu, 29 Jan 2015 21:47:42 +0000 (21:47 +0000)]
am
5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
* commit '
5df10e1842606f9a9a829a4779bf8f610b2d7bd9':
Suppress logging to avoid showing phone no.
Sanket Padawe [Thu, 29 Jan 2015 21:44:04 +0000 (21:44 +0000)]
Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
Jon Larimer [Thu, 29 Jan 2015 20:54:43 +0000 (15:54 -0500)]
Fix build breakage in older branches by avoiding <> notation
Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
Raph Levien [Thu, 29 Jan 2015 20:49:19 +0000 (12:49 -0800)]
Refine resolution order for typeface and fontFamily
Previously any fontFamily value on a TextView would override a typeface
value, even if the fontFamily is from a TextAppearance (for example,
from the theme) and the typeface is explicitly set. This patch changes
the resolution order to fontFamily set directly on the TextView,
typeface set directly on the TextView, fontFamily from TextAppearance,
typeface from TextAppearance.
Bug:
16154223
Change-Id: I45c1e511fba8f64eb236200e3fa2e885c02b59dc
John Reck [Thu, 29 Jan 2015 20:28:08 +0000 (20:28 +0000)]
am
5f3e21ce: am
6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
* commit '
5f3e21cebeecf042e8e18a5021b3965415d9ff60':
Allow ~Layer() to happen after onGLContextDestroyed
Christopher Ferris [Thu, 29 Jan 2015 01:56:32 +0000 (17:56 -0800)]
Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.
Bug:
19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
Change-Id: Icc1a26593237ca19ad0ebd776a60b3d6290bb355
John Reck [Thu, 29 Jan 2015 20:18:58 +0000 (20:18 +0000)]
am
6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
* commit '
6efc3ac6d2094c72b6a2e288101a5349b017274d':
Allow ~Layer() to happen after onGLContextDestroyed