Alan Viverette
2db37d29cd
am a65709c0: am 7094ec0f: am 748dd3c4: Merge "Always apply surface insets" into lmp-dev
...
* commit 'a65709c05bb825af83156f14242e05e81976fa4f':
Always apply surface insets
2014-07-21 22:24:15 +00:00
Craig Mautner
e6628fba6a
am 456e8fc5: am e62332fb: am e15321a5: Merge "Don\'t create a delegate for null callbacks." into lmp-dev
...
* commit '456e8fc54b588cc291befe5ebeb3cb01e1f7e7fd':
Don't create a delegate for null callbacks.
2014-07-21 22:23:58 +00:00
Alan Viverette
8c1982c33a
am 7094ec0f: am 748dd3c4: Merge "Always apply surface insets" into lmp-dev
...
* commit '7094ec0f6344823cdf1525f52bf70f2f0230d548':
Always apply surface insets
2014-07-21 22:05:35 +00:00
Alan Viverette
c7d564751b
am 748dd3c4: Merge "Always apply surface insets" into lmp-dev
...
* commit '748dd3c4ef4cf2fc5252b79f1854464f4070c89c':
Always apply surface insets
2014-07-21 21:59:18 +00:00
Craig Mautner
198d2f4897
am e62332fb: am e15321a5: Merge "Don\'t create a delegate for null callbacks." into lmp-dev
...
* commit 'e62332fbcbc9acca2b8f694ff890ac0b1301283c':
Don't create a delegate for null callbacks.
2014-07-21 21:42:22 +00:00
Craig Mautner
5a40c47f8f
am e15321a5: Merge "Don\'t create a delegate for null callbacks." into lmp-dev
...
* commit 'e15321a50547cd5461b69e0a78f76343b66d184f':
Don't create a delegate for null callbacks.
2014-07-21 21:38:43 +00:00
Jeff Sharkey
930f93605c
am 31bbf83f: am c7a62d72: am a56503ee: Detect bundled app ABI for cluster-style layout.
...
* commit '31bbf83f930e3aef8e5aba865b3a29a9127a818b':
Detect bundled app ABI for cluster-style layout.
2014-07-21 20:40:37 +00:00
Jeff Sharkey
421a7f7906
am c7a62d72: am a56503ee: Detect bundled app ABI for cluster-style layout.
...
* commit 'c7a62d728f1546e8feda4f1d22a835593c8d36a3':
Detect bundled app ABI for cluster-style layout.
2014-07-21 20:36:40 +00:00
Jeff Sharkey
d64cab615d
am a56503ee: Detect bundled app ABI for cluster-style layout.
...
* commit 'a56503ee4f48c4d1b4c5ce13eeccc11a49f44a25':
Detect bundled app ABI for cluster-style layout.
2014-07-21 20:32:04 +00:00
destradaa
96e92d7df8
am 0c391da3: am 3fafcc8a: am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev
...
* commit '0c391da32542c1186b81128e9a6725eb5744999c':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308
2014-07-21 20:29:44 +00:00
Jeff Sharkey
6038625175
Detect bundled app ABI for cluster-style layout.
...
Now that build system switched to cluster-style layout for bundled
apps, we need to detect primary/secondary ABI based on that layout.
Bug: 16456263
Change-Id: If6daf60ee1815bb6fde560a0c373b4f2bc8bd3a8
2014-07-21 13:28:16 -07:00
destradaa
c025fa146b
am 3fafcc8a: am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev
...
* commit '3fafcc8acab04076f697208c2d342d9292007957':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308
2014-07-21 20:25:22 +00:00
destradaa
c9cb795b51
am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev
...
* commit 'd26d2bf6311113e0d1b25048898f4de7a4c39ed4':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308
2014-07-21 20:20:52 +00:00
Andrew Lee
ac915a3063
am 5f129750: am 372a5616: am 0accc6a0: Merge "Add video call profile constructor which takes video state only." into lmp-dev
...
* commit '5f1297502a4a8dd6699798a180e103d0cfdec9ef':
Add video call profile constructor which takes video state only.
2014-07-21 20:05:09 +00:00
Andrew Lee
00b31295cc
am 372a5616: am 0accc6a0: Merge "Add video call profile constructor which takes video state only." into lmp-dev
...
* commit '372a5616af56d889fc038110321cd511fb690b91':
Add video call profile constructor which takes video state only.
2014-07-21 20:01:43 +00:00
Andrew Lee
6193847c18
am 0accc6a0: Merge "Add video call profile constructor which takes video state only." into lmp-dev
...
* commit '0accc6a0d0d2778ab0ef3df4a50ff9ff89a33b71':
Add video call profile constructor which takes video state only.
2014-07-21 19:57:29 +00:00
Santos Cordon
1cdd9d185d
am 31e81ea6: am 59dcf65a: am a99cc3f9: Sent initial data to telecomm on connection creation. (1/3)
...
* commit '31e81ea6267582ddfd00ff75a1f8a7f9e46edcbb':
Sent initial data to telecomm on connection creation. (1/3)
2014-07-21 19:49:14 +00:00
Andres Morales
d0da576425
am fca5a2d1: am c55c7dd7: am 47855ed4: Don\'t register PDBService if not available on device
...
* commit 'fca5a2d1e59a6645075c74ab32ed565d48f1c14c':
Don't register PDBService if not available on device
2014-07-21 19:49:04 +00:00
Santos Cordon
e68d0ae6d2
am 59dcf65a: am a99cc3f9: Sent initial data to telecomm on connection creation. (1/3)
...
* commit '59dcf65a90249d149654613faaeb153e0d2ffe46':
Sent initial data to telecomm on connection creation. (1/3)
2014-07-21 19:42:06 +00:00
Andres Morales
a4d9c1e48c
am c55c7dd7: am 47855ed4: Don\'t register PDBService if not available on device
...
* commit 'c55c7dd7aebeaa9ba08394008b5bbaf86f5214ed':
Don't register PDBService if not available on device
2014-07-21 19:42:01 +00:00
Santos Cordon
5c344af542
am a99cc3f9: Sent initial data to telecomm on connection creation. (1/3)
...
* commit 'a99cc3f910d494a28db4d6ae6d6b3cd978a950a1':
Sent initial data to telecomm on connection creation. (1/3)
2014-07-21 19:37:47 +00:00
Andres Morales
71605bcab4
am 47855ed4: Don\'t register PDBService if not available on device
...
* commit '47855ed4c5f1d0b72de0ab153f6537a46d178930':
Don't register PDBService if not available on device
2014-07-21 19:37:44 +00:00
Andrew Lee
062ce9e50e
am a4d34691: am 7f757f79: am aa2fc60d: Catch RemoteException when setting the camera or zoom.
...
* commit 'a4d34691d51f452e080df3414fb25df62f2022d0':
Catch RemoteException when setting the camera or zoom.
2014-07-21 19:36:43 +00:00
Santos Cordon
e8dc4bef00
Sent initial data to telecomm on connection creation. (1/3)
...
Telecomm was not sending the initial state for new connections forcing
the connection services to postpone when they set data on the connection
which resulted in hacky code. This CL makes use of a
ParcelableConnection to send the intial connection data.
Change-Id: If571414aba19fa1bb282e30632431962b8366cf4
2014-07-21 19:29:39 +00:00
Santos Cordon
17fd16c262
am a317b4b5: am 80397901: am 0be30edf: Revert "Change display Strings to CharSequence (1/2)"
...
* commit 'a317b4b560cfa9955b1a0f3d902f67b47df52678':
Revert "Change display Strings to CharSequence (1/2)"
2014-07-21 19:24:44 +00:00
RoboErik
e66202b7ef
am 77519208: am 81042e1e: am cfd3f8ae: Deprecate apis that were replaced by sessions
...
* commit '775192087ab3de3997fb037d521616aa1f9c5a97':
Deprecate apis that were replaced by sessions
2014-07-21 19:24:36 +00:00
destradaa
2774d535c7
am 584ca2bf: am a4d0d8c2: am 77e1c1a5: Merge "Update GPS HAL raw measurements support." into lmp-dev
...
* commit '584ca2bf83097c8e3b321808e647b1a565f683ed':
Update GPS HAL raw measurements support.
2014-07-21 19:24:31 +00:00
Adam Powell
0b6027d25d
am bf0fcd80: am 2b0d3fc7: am dd896d93: Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev
...
* commit 'bf0fcd8047305c2d9015047d60396ff1d244898c':
Sort ResolverActivity items based on UsageStats
2014-07-21 19:24:25 +00:00
Santos Cordon
7bd27d4da0
am 43306695: am 1557474e: am b5e00844: Change display Strings to CharSequence (1/2)
...
* commit '433066955950e6112ae7708a97da522632960b1e':
Change display Strings to CharSequence (1/2)
2014-07-21 19:24:21 +00:00
Andrew Solovay
0c74ac9b62
am 8db40c45: am 469db690: am cf300d2f: am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit '8db40c45ab44a004f66e87f206087cd043f0f1d5':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 19:24:10 +00:00
Jean-Michel Trivi
076317ee4d
am c42de9d6: am 61734857: am 61b79634: Merge "AudioAttributes for SoundPool" into lmp-dev
...
* commit 'c42de9d6a622dc71d76927cfdef2cbb57c205f90':
AudioAttributes for SoundPool
2014-07-21 19:24:06 +00:00
Deepanshu Gupta
e32bac5ef0
am 37423bbb: am db2a5ff1: am 78d85419: Fix missing initial moveto in path definition.
...
* commit '37423bbbeab2822b39d859412aa80117a4b85282':
Fix missing initial moveto in path definition.
2014-07-21 19:23:58 +00:00
Craig Mautner
ee4c9ffb10
am ca30ccb5: am 28d5d4df: am 52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
...
* commit 'ca30ccb556f6814c5ac4352adb95c7eb22652d6b':
Rename flag and attribute per API council
2014-07-21 19:23:51 +00:00
Ricardo Cervera
2a6becc4b1
am d9f417de: am 2f08e6ea: am f47dab8b: am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'd9f417dedc8f5bc610bb0ade0aeafdb9c5857f55':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 19:23:45 +00:00
Derek Sollenberger
8d519bc8d2
am 23d8fbc1: am 9a27e8f2: am 1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev
...
* commit '23d8fbc1d8f414f40b204c148e1c2f31079267c3':
Remove invalid SkASSERT that prevents us from running with SK_DEBUG
2014-07-21 19:23:39 +00:00
Yorke Lee
b38a8d5ec1
am aebd7c1c: am b9105f15: am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
...
* commit 'aebd7c1c6764a8535aaf29ba334225d1ea42dff7':
Add call log entries to all currently running users
2014-07-21 19:23:35 +00:00
Derek Sollenberger
27efc49634
am 994bfa4b: am 61cc70a2: am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
...
* commit '994bfa4b469186ffe08b7303ee9e56722c7dd576':
Separate Canvas JNI code from the implementation.
2014-07-21 19:23:25 +00:00
Robert Ly
c0ec451e21
am 9c41be31: am d93a4d1b: am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit '9c41be31b8bcff2ba3f4cf09d9f8bf0e7690fce1':
docs: change copy for edu video
2014-07-21 19:23:15 +00:00
Adrian Roos
936835911e
am 884a8f73: am 4f5106e7: am c1c28902: More user switching goodness
...
* commit '884a8f73afc8858cde395c5cd28d6f905a05780a':
More user switching goodness
2014-07-21 19:22:54 +00:00
Craig Mautner
ddd0e4049f
am ca22b33f: am b7bb95b0: am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"
...
* commit 'ca22b33f6026c5bfe1af32edb0890c9319f31d1e':
Skip broadcasting to a receiver if the receiver seems to be dead
2014-07-21 19:22:30 +00:00
Dan Sandler
f13cdabb93
am 61681416: am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.
...
* commit '616814161410d9794d7de89a5f04742f74e622eb':
Defend against null ApplicationInfos.
2014-07-21 19:21:38 +00:00
Wonsik Kim
58ba7fa3a9
am 168ec8b1: am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev
...
* commit '168ec8b13227d9756dc4c49c3a0cd20a5f627776':
TIF: fix indexOfValue usage
2014-07-21 19:21:32 +00:00
Wonsik Kim
3ada306de4
am 8f3b99c4: am caed0312: am acbd8d4a: Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev
...
* commit '8f3b99c4325259e15c05161fcff68690070c4ccc':
TIF: fix tvInputType attribute to match with TvInputInfo
2014-07-21 19:21:28 +00:00
Adrian Roos
1122b9945e
am 9b521513: am 35e21d40: am a727db86: Update LockPatternUtils to new alarm API
...
* commit '9b52151396d3a735a6f966f8c24e76df7cfb25ba':
Update LockPatternUtils to new alarm API
2014-07-21 19:21:18 +00:00
Niels Egberts
d1dc888f48
am 8451acc7: am 1eb446a5: am 7a925857: New TtsSpan builders for money, electronic and telephone.
...
* commit '8451acc7e2fdca720098daea1937230375d62778':
New TtsSpan builders for money, electronic and telephone.
2014-07-21 19:21:13 +00:00
Jungshik Jang
b66de10fa4
am 353dcd70: am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev
...
* commit '353dcd7034fa69f8061c2079be5523f5b4102387':
Add two apis for one touch record.
2014-07-21 19:21:06 +00:00
Ji-Hwan Lee
166ff6cc6d
am 6ed883cf: am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev
...
* commit '6ed883cf469c99e45d4a53a5fd5b6e9fc7503fb4':
TIF: Extend multiple TV input per service for HDMI logical devices
2014-07-21 19:21:02 +00:00
Santos Cordon
fe96a7db13
am 060452d8: am 5cafb03d: am e0cd9db8: Change telecomm APIs from protected to public (1/3)
...
* commit '060452d83dc4943ca2c7954dc9e2be8c86619815':
Change telecomm APIs from protected to public (1/3)
2014-07-21 19:20:57 +00:00
Jungshik Jang
5013b471b0
am d33d1732: am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
...
* commit 'd33d1732261446120fe85b67acde7097870d5b09':
Do no send <Feature Abort> as response of <Feature Abort>
2014-07-21 19:20:47 +00:00
Jinsuk Kim
be3b63668a
am d01a0137: am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
...
* commit 'd01a01374b6407c34b4b30ad74db25299f36fc07':
Invoke callback for HdmiControlService.deviceSelect() for internal source
2014-07-21 19:20:43 +00:00