Jean-Michel Trivi
1c418f5af4
am 25f47ef4: Merge "New MediaFormat keys for AAC" into lmp-dev
...
* commit '25f47ef4b11116fae9ca1cd3edc328435e56a194':
New MediaFormat keys for AAC
2014-07-22 00:02:17 +00:00
Jinsuk Kim
5cbf14aab9
am aec45c28: Revert "Send TV app the intent for the new active source"
...
* commit 'aec45c28846652185d47dd74abe86fc2f0b8c546':
Revert "Send TV app the intent for the new active source"
2014-07-21 23:55:50 +00:00
Jinsuk Kim
469085e4fe
Revert "Send TV app the intent for the new active source"
...
This reverts commit 9808af71a190844cd5eb493d87870238a31fa408.
Change-Id: I0e019534c07b230173230d064c6d8bc389fafcbc
2014-07-21 23:52:39 +00:00
Jinsuk Kim
16cfe2c478
am 9808af71: Send TV app the intent for the new active source
...
* commit '9808af71a190844cd5eb493d87870238a31fa408':
Send TV app the intent for the new active source
2014-07-21 23:22:44 +00:00
Jinsuk Kim
0f68d62a4b
Send TV app the intent for the new active source
...
When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device.
Change-Id: I29b28a4365d1454a8bbe947ddb5df4371960c71a
2014-07-21 23:18:00 +00:00
Adam Lesinski
b06131fd9c
am 3702b836: Merge "Change UsageStatsService to check uses-permission" into lmp-dev
...
* commit '3702b836126fa77492faaa42bbd0ea1f4c5143f8':
Change UsageStatsService to check uses-permission
2014-07-21 23:17:47 +00:00
Yorke Lee
b8b64de69d
am 82c0b5df: Expose call settings as public API (1/3)
...
* commit '82c0b5df73ead3f84f1a59818f4b5bab47ab9957':
Expose call settings as public API (1/3)
2014-07-21 23:17:41 +00:00
Yorke Lee
3818a89220
Expose call settings as public API (1/3)
...
Other settings activities like wifi settings, mobile network settings
etc are all accessible by third party apps via public intents, so
make CallFeaturesSettings similarly available.
Bug: 16298644
Change-Id: Ia615797e20f396a38fe382f3a2d54ec41c5249ef
2014-07-21 16:10:08 -07:00
Ying Wang
300a7c5623
am 1e976fd5: Build framework.jar with multidex support.
...
* commit '1e976fd50f83a43a1df49a6670f813a57d1a625a':
Build framework.jar with multidex support.
2014-07-21 22:29:48 +00:00
Amith Yamasani
eb7fd38389
am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden
...
* commit 'f8b67f1f4e34664854421d92efd0955d405c7a71':
Rename setApplicationBlocked to setApplicationHidden
2014-07-21 22:25:15 +00:00
Ying Wang
88e199045b
Build framework.jar with multidex support.
...
We don't need the framework/framework2 split now with the multidex
support.
Change-Id: I30ee5c7e24df87b2c54e854f17fbf0b5adef4c60
2014-07-21 15:23:14 -07:00
Amith Yamasani
e5bcff624f
Rename setApplicationBlocked to setApplicationHidden
...
This corrects the expected behavior of the app state. Hidden apps
can be installed by the store to be brought out of hidden state.
Bug: 16191518
Change-Id: Id128ce971ceee99ba1dea14ba07ce03bd8d77335
2014-07-21 22:18:40 +00:00
Alan Viverette
321f8fe6dc
am c912f9f5: Merge "Move insets out of edit text background" into lmp-dev
...
* commit 'c912f9f5f935eafdab235182627088366b8cff59':
Move insets out of edit text background
2014-07-21 21:59:21 +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
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
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
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
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
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
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
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
Andres Morales
1e586e08bf
Don't register PDBService if not available on device
...
Bug: 16455896
Change-Id: If576ce8e837ba498f10848795706efb29e76974a
2014-07-21 12:16:32 -07:00
Andrew Lee
57b56a7356
am aa2fc60d: Catch RemoteException when setting the camera or zoom.
...
* commit 'aa2fc60db26a5b9836efa74e2ec3f11c2be5f419':
Catch RemoteException when setting the camera or zoom.
2014-07-21 19:09:25 +00:00
Andrew Lee
054c6d965f
Catch RemoteException when setting the camera or zoom.
...
Bug: 16014280
Change-Id: I7542a0f294929fac589260ab596730d89948c89e
2014-07-21 12:03:16 -07:00
Santos Cordon
b2b1161adb
am 0be30edf: Revert "Change display Strings to CharSequence (1/2)"
...
* commit '0be30edf78586a51d1b58c5326a412ae9bbd01d7':
Revert "Change display Strings to CharSequence (1/2)"
2014-07-21 18:48:47 +00:00
Santos Cordon
d1c344e412
Revert "Change display Strings to CharSequence (1/2)"
...
This reverts commit b5e0084414258ff294e7d94bcf9f8492f8ab2d25.
Change-Id: I095483414f5e0076c0967b6f1955a0fe71f2b8d9
2014-07-21 18:43:35 +00:00
RoboErik
d4ebf9e231
am cfd3f8ae: Deprecate apis that were replaced by sessions
...
* commit 'cfd3f8ae64f7d91246689b96524aac1922758c84':
Deprecate apis that were replaced by sessions
2014-07-21 18:31:37 +00:00
RoboErik
edb158f55f
Deprecate apis that were replaced by sessions
...
These classes all have new components in the session APIs.
bug:16218444
Change-Id: Ib64ff0e23503e4c9eb2fd9162a878e1eaba7c4df
2014-07-21 18:26:42 +00:00
destradaa
d4e8bc0a59
am 77e1c1a5: Merge "Update GPS HAL raw measurements support." into lmp-dev
...
* commit '77e1c1a5e6206ffca7b26dabc167f28c7e1d7d18':
Update GPS HAL raw measurements support.
2014-07-21 18:21:36 +00:00
Adam Powell
139330749f
am dd896d93: Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev
...
* commit 'dd896d93fe6433385dcd47fc7e165a9f894c9e52':
Sort ResolverActivity items based on UsageStats
2014-07-21 18:14:02 +00:00
Santos Cordon
1079b3306d
am b5e00844: Change display Strings to CharSequence (1/2)
...
* commit 'b5e0084414258ff294e7d94bcf9f8492f8ab2d25':
Change display Strings to CharSequence (1/2)
2014-07-21 18:09:57 +00:00
Santos Cordon
9cc383353e
Change display Strings to CharSequence (1/2)
...
Bug: 16416927
Change-Id: I81cd3572f3931cd97611621a1db12bea165bda56
2014-07-21 18:05:52 +00:00
Andrew Solovay
1d423ea336
am cf300d2f: am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit 'cf300d2f0e6320e530a26c7adeaf1dbd27c694e4':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 18:01:43 +00:00
Andrew Solovay
6f4d821003
am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit '30aa5924f0a372a10c7245a16ee460359826ab9c':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 17:53:30 +00:00
Jean-Michel Trivi
03ed0e8248
am 61b79634: Merge "AudioAttributes for SoundPool" into lmp-dev
...
* commit '61b79634d4cfae4448af6a512cb66488467274de':
AudioAttributes for SoundPool
2014-07-21 17:53:26 +00:00
Andrew Solovay
30aa5924f0
am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 17:47:13 +00:00
Deepanshu Gupta
99ba6fb978
am 78d85419: Fix missing initial moveto in path definition.
...
* commit '78d8541976f31a018ace165b0e95bab81a136bb3':
Fix missing initial moveto in path definition.
2014-07-21 17:44:47 +00:00
Deepanshu Gupta
3b37956010
Fix missing initial moveto in path definition.
...
The Path_Delegate was missing a moveTo call which resulted in
IllegalPathStateException when rendering the ProgressBar.
Change-Id: Ibdae5f90ffd0a71a3de4ba945238239faa0b18b2
2014-07-21 17:36:45 +00:00
Craig Mautner
e21f15eb50
am 52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
...
* commit '52cf4df1c333232977b323fd6b0d5f41f3a135eb':
Rename flag and attribute per API council
2014-07-21 17:31:55 +00:00
Ricardo Cervera
e37501bd5f
am f47dab8b: am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'f47dab8b86224debcebe27b84d4a84b165c9b3eb':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:20:18 +00:00
Ricardo Cervera
e6ab031e3c
am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'fef0011144e2223df382abae412f145c5ea41548':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:15:09 +00:00
Ricardo Cervera
fef0011144
am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:11:42 +00:00
Ricardo Cervera
d73eb7f9c9
am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:07:00 +00:00
Derek Sollenberger
c784ce0fb5
am 1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev
...
* commit '1bf087a904aaa7b4fbd7302600f1cbd98e540855':
Remove invalid SkASSERT that prevents us from running with SK_DEBUG
2014-07-21 17:01:19 +00:00
Yorke Lee
0d6b31426b
am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
...
* commit 'ec0197dae050d48b803b803b082d619925306fc0':
Add call log entries to all currently running users
2014-07-21 17:01:15 +00:00
Derek Sollenberger
22c0fc66b0
am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
...
* commit '521830a79ba1e56429b31607a4c5af990cd76542':
Separate Canvas JNI code from the implementation.
2014-07-21 16:45:15 +00:00
Robert Ly
acee769c0b
am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit '077d56225b53ef152474e0aed27fe4010139fe01':
docs: change copy for edu video
2014-07-21 16:26:43 +00:00
Robert Ly
fb06b4800c
am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit '205196f128b13eecea2789506341c7ecd2044b71':
docs: change copy for edu video
2014-07-21 16:22:12 +00:00
Robert Ly
205196f128
am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
docs: change copy for edu video
2014-07-21 16:17:39 +00:00