Ihab Awad
94cf4bff13
Wire up multi-SIM experience (1/4)
...
Change-Id: Ib63843267f06b329a675e7ea86167b2cbb554f1b
2014-07-18 10:02:25 -07:00
Jean-Michel Trivi
010150a136
Merge "Unhide audio virtualizer capability query methods" into lmp-dev
2014-07-17 21:09:48 +00:00
Jean-Michel Trivi
2e7dd4bfc2
Unhide audio virtualizer capability query methods
...
Unhide the new method to query the Virtualizer effect implementation
about its capabilities in terms of input, device support, and
virtual speaker angles.
Change-Id: I4478f7837efe8c9d52978244a3402c7f8590e585
2014-07-18 08:01:07 -07:00
Narayan Kamath
53777b58f3
Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev
2014-07-17 19:51:18 +00:00
Yigit Boyar
753c114d84
Update RecyclerView scroll listener to the new API
...
Bug: 16054949
Change-Id: I264a701e8b298a08f09bb30284099734054d518c
2014-07-18 16:13:14 +00:00
Narayan Kamath
6648dded69
Fix broken locale related assumptions in TextServicesManager.
...
startsWith is a bogus check unless languages match. Also, don't
assume 2 letter languages.
bug: 10090157
Change-Id: I8adda61bddc465aac261c0ce2023fa9606affe1b
2014-07-18 15:02:34 +01:00
Niels Egberts
f976abe700
Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev
2014-07-17 19:45:26 +00:00
Niels Egberts
a896363400
Add builders for TtsSpans of type ordinal, decimal and fraction.
...
Also document the possibility to give phone numbers in parts.
Change-Id: Ie1cdf56cc3b6c221c9410fb02dcba2568ea337b7
2014-07-18 13:43:22 +01:00
Niels Egberts
7a56ea350f
Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev
2014-07-17 19:45:26 +00:00
Niels Egberts
6e7c8995dd
New TtsSpan builders for types measure, time, date, digits and verbatim.
...
Change-Id: I60022aa72c64f454261a0b69c21c45ce6351b9e7
2014-07-18 16:36:11 +01:00
John Spurlock
1f9cd414b2
Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev
2014-07-17 19:20:15 +00:00
John Spurlock
c86f573fb8
Volume: Dismiss shade when launching settings from rocker.
...
The volume dialog can appear over the expanded QS panel. Dismiss
the shade when launching zen settings so that it is not obscured.
Bug:16397104
Change-Id: Icc9e7107572305d366a9648f5082096ff92a8b71
2014-07-18 11:45:05 -04:00
Craig Mautner
e2e280ec59
Merge "Restore calling identity before checking permission" into lmp-dev
2014-07-17 17:59:02 +00:00
Craig Mautner
85c11a8831
Restore calling identity before checking permission
...
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.
Fixes bug 16215650.
Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
2014-07-17 12:38:18 -07:00
RoboErik
69b86207bf
Merge "return false for media keys if no controller" into lmp-dev
2014-07-17 18:05:14 +00:00
RoboErik
28204a768e
return false for media keys if no controller
...
bug:16311395
Change-Id: I4cde865858f99a9159abc181cc987fbd9866025b
2014-07-17 12:18:32 -07:00
Joe Fernandez
9142a0f80c
am 64ae9303: am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps
...
* commit '64ae930359619f2a49c8a4bef5dc45261c772d45':
docs: Update ADT-1 page with supported apps
2014-07-17 18:16:10 +00:00
John Reck
21f61b7d87
Merge "Fix logging" into lmp-dev
2014-07-17 18:05:14 +00:00
John Reck
5cdb8f998c
Fix logging
...
Bug: 16357287
Change-Id: Ic14e32c941e42ab1f1ed51ff8ed7185979e57a55
2014-07-17 18:12:01 +00:00
Ruben Brunk
84cca777e2
Merge "camera2: Fix swapped Face detection commands." into lmp-dev
2014-07-17 18:11:21 +00:00
Ruben Brunk
40001f5dac
camera2: Fix swapped Face detection commands.
...
Bug: 16343647
Change-Id: I06186b1d6a2ef5d73d2e22759e947156d43cab3f
2014-07-17 18:04:42 +00:00
Jeff Brown
a37900658b
Merge "Add glance sensor for doze mode." into lmp-dev
2014-07-17 17:59:02 +00:00
Jeff Brown
241e70d607
Add glance sensor for doze mode.
...
Change-Id: I66d11a1f032017b16d3f57fa60699a02d67ad5f1
2014-07-17 18:19:53 -07:00
Baligh Uddin
512d208b7a
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-17 17:59:02 +00:00
Baligh Uddin
6129e1de00
Import translations. DO NOT MERGE
...
Change-Id: I6fe58205152413f355bf5f8b13c792d421b6a15e
Auto-generated-cl: translation import
2014-07-20 12:02:09 -07:00
Baligh Uddin
57103ba86d
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-18 18:24:25 +00:00
Baligh Uddin
a17d1d2733
Import translations. DO NOT MERGE
...
Change-Id: I73983e44eec615f929d27351032fd1d532ee68a1
Auto-generated-cl: translation import
2014-07-20 12:03:51 -07:00
Sandeep Siddhartha
055897208d
Move sound trigger calls to VoiceInteractionManagerService
...
- This ensures that any data being loaded on the DSP comes from the framework
Change-Id: Ie15f0994850ba8f298ca07c49fe0b89e066d9e2b
2014-07-20 11:22:55 -07:00
Jeff Brown
7139645049
Merge "Allow dreams to wake up gently." into lmp-dev
2014-07-17 17:59:02 +00:00
Jeff Brown
f6d466895b
Allow dreams to wake up gently.
...
This change adds a new DreamService.wakeUp() method to allow a
dream to wake itself up gently and perform a transition before
finally finishing. The power manager will ask a dream to wake
up gently in most cases but may force it to happen immediately
when necessary.
If the dream takes too long to finish itself then the dream
controller will douse it with water summarily after 5 seconds.
Change-Id: Ib0564c5650cd5a454e1acc5aa91fe46995eecfa7
2014-07-18 21:56:08 -07:00
Jeff Brown
5dc219142a
Add new Display.STATE_DOZE_SUSPEND power state.
...
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07:00
Jae Seo
31380e8424
Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
2014-07-18 18:24:25 +00:00
Jae Seo
bbcd206a79
TIF: Add a way to notify whether the current program content is allowed
...
Now we have a complete set of API to tell the entire cases (allowed and
blocked), which makes possible for the application to rely more on
actions taken by TV input services transferring the responsibility for
parental control.
Bug: 13172379
Change-Id: I7b0dcf16b870782c76a428a1dac6ef1a528b7d40
2014-07-18 17:13:07 -07:00
Dongwon Kang
c8cd55a30c
Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev
2014-07-17 21:07:39 +00:00
Dongwon Kang
4b662d1b98
TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
...
This change adds a class which will be used for the TV input which controls an external device
which is connected to the pass-through TV input.
Bug: 15496325
Change-Id: I52d48c45570c2d62d759a9da2ab96ec8461c13f7
2014-07-19 13:36:07 +09:00
Chelsea Derrick
92a12ead1b
Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]" into lmp-dev
2014-07-17 17:59:02 +00:00
Chelsea Derrick
adae06be9b
Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]
...
Bug: 16153258
Change-Id: Ic4fcf1d5454b9bf5ae31cefb48322dae187338bc
(cherry picked from commit 761f6cb69d3ac20dfc274eed2246f50da942b0c0)
2014-07-18 12:40:10 -07:00
Baligh Uddin
2468a222b8
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-17 17:59:02 +00:00
Baligh Uddin
c6675a4dcb
Import translations. DO NOT MERGE
...
Change-Id: Iccd6de29591b724ac87fbd83638f5eb256daceb1
Auto-generated-cl: translation import
2014-07-19 21:42:22 +00:00
Baligh Uddin
10ad34ed51
Import translations. DO NOT MERGE
...
Change-Id: I2fd968db41fad34de4cbabdac45b4b4d9bad0c05
Auto-generated-cl: translation import
2014-07-19 21:42:13 +00:00
Andrew Lee
ba051aa6f8
Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev
2014-07-17 17:59:02 +00:00
Andrew Lee
dd1b0e7874
Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.
...
Change-Id: I521be8fd0e898c78864dab62593d26806eb11fec
2014-07-18 12:35:02 -07:00
Makoto Onuki
3e2a9f7958
Merge "Use "current" cp2 from telephony" into lmp-dev
2014-07-17 17:59:02 +00:00
Makoto Onuki
5692dcced5
Use "current" cp2 from telephony
...
Now "always send to voicemail" and missed call notifications respect the
current user's contacts.
Bug 16236656
Change-Id: Iae48b4ac95550970ecae59bdd32c436efef90200
2014-07-17 15:57:49 -07:00
ztenghui
738177caf6
Add the RTL support to VectorDrawable.
...
bug:15905631
Change-Id: Ieb3dcac2dd446ba89f307716411688dcd6ec5279
2014-07-17 17:37:19 +00:00
John Reck
580ff8142b
Revert "Separate Canvas JNI code from the implementation."
...
This reverts commit e28a5afee885cd69a5be5809f88116b601cb1a72.
Appears to cause memory corruption and random appearances of
chinese
Bug: 16343240
Bug: 16336642
Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b
2014-07-17 17:36:24 +00:00
Winson Chung
4fc90de51b
Fixing regression in flinging not updating the stack. (Bug 16371020)
...
Change-Id: I6397c854dc0d305206eb3b48de855c58cf2740ea
2014-07-17 17:33:03 +00:00
Joe Fernandez
e1e81a9ee0
am e287cf33: docs: Update ADT-1 page with supported apps
...
* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
docs: Update ADT-1 page with supported apps
2014-07-17 16:44:19 +00:00
Craig Mautner
b3325cbb26
Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev
2014-07-17 16:16:48 +00:00
Craig Mautner
aa9b0f1575
resolved conflicts for merge of 0a931069 to lmp-dev
...
Conflicts:
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
2014-07-17 10:50:18 -07:00