Dan Sandler
9591597f53
am ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev
...
* commit 'ce4dc71cfc0ecbfe1bd504b5d906fbd81b2164b1':
Album artwork returns triumphantly to the lockscreen.
2014-07-17 14:17:16 +00:00
John Spurlock
6530a89c8e
am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
...
* commit 'efe8514f89c8f8ecd256f8fc1ef577cbcec05421':
Update data limit notification icon + strings.
2014-07-17 14:17:12 +00:00
Sandeep Siddhartha
7c7e18a2bd
am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
...
* commit '43bc655b3c5ddd70af813280d9125797d076d00e':
Add code for isKeyphraseActive and some logging to help debug issues
2014-07-17 14:17:08 +00:00
John Spurlock
42140162ea
am 45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
...
* commit '45aebdf2d2b552914abf9656a69bc92bd6540b54':
Add a zen-specific event sink, include in dumpstate.
2014-07-17 14:17:05 +00:00
Amith Yamasani
5d74829cf9
am b31b07c8: Merge "Allow content provider access across users" into lmp-dev
...
* commit 'b31b07c8b10937f3071300068da64158d3686513':
Allow content provider access across users
2014-07-17 14:17:01 +00:00
Lorenzo Colitti
3acb0871a3
am 1098531c: Disable logging in NetlinkTracker.
...
* commit '1098531c19d337b4544c51e446e859d86e7fdab9':
Disable logging in NetlinkTracker.
2014-07-17 14:16:57 +00:00
Chris Craik
0dd0ebad92
am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
...
* commit 'b63869a6fb76ede4492f2184ae005687ac70c916':
Add accessibility text contrast setting
2014-07-17 14:16:53 +00:00
Santos Cordon
61406a1fce
am ec82a805: Add toString & equals helper methods to PhoneAccount.java
...
* commit 'ec82a805b55ce61e2049d66d74fbab5610577013':
Add toString & equals helper methods to PhoneAccount.java
2014-07-17 14:16:50 +00:00
Baligh Uddin
5676e0668f
am 54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '54639300d0ec7424fe6b18ba82f0293c2543c62f':
Import translations. DO NOT MERGE
2014-07-17 14:16:47 +00:00
John Spurlock
186f2c40fa
am fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
...
* commit 'fddad8871e41cedc2b0bb31edd7f3a509ac7c403':
QS: Deal with null uuids in BT controller.
2014-07-17 14:16:43 +00:00
Baligh Uddin
8b9d339b33
am 9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9988df2980dbe0529eca8ba4379b061197166a55':
Import translations. DO NOT MERGE
2014-07-17 14:16:40 +00:00
Baligh Uddin
b15d7f3d97
am da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'da616efd015e372c3e02c1b9368fe66badb0341d':
Import translations. DO NOT MERGE
2014-07-17 14:16:36 +00:00
Jungshik Jang
ae97df329c
am 6d98d91f: Merge "Hook up system audio mode" into lmp-dev
...
* commit '6d98d91f01dc77af031bf9d8537d101110ba43e5':
Hook up system audio mode
2014-07-17 14:16:33 +00:00
Dianne Hackborn
31cfdadb56
am 8b353ef1: Merge "Maybe fix issue #16167054 : Wakelock is acquired and released in..." into lmp-dev
...
* commit '8b353ef1ac284d2ad306de7d6609ebc1b1053ede':
Maybe fix issue #16167054 : Wakelock is acquired and released in...
2014-07-17 14:16:30 +00:00
Vinit Deshpande
b3e7af7364
am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
...
* commit '0b4d73dd5885a2ef86e14f77ff1963c42d6c59b9':
Introduce RTT Manager
2014-07-17 14:16:26 +00:00
Chelsea Derrick
9a51a3bee8
am 52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
...
* commit '52c8bd50f87388f6c32b3664d46723490e7e3502':
Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
2014-07-17 14:16:23 +00:00
Baligh Uddin
c2dd4d2713
am 6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6b7e527ae3433a7be5234578d923a6ed149e3e48':
Import translations. DO NOT MERGE
2014-07-17 14:16:19 +00:00
Baligh Uddin
c72e186971
am ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ca0db50aaa768353686fdcf76de6dfb701bf67e0':
Import translations. DO NOT MERGE
2014-07-17 14:16:16 +00:00
Baligh Uddin
40d7d207b2
am 2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '2b8858a901e45119c78e239c2c34b3e2486ee692':
Import translations. DO NOT MERGE
2014-07-17 14:16:13 +00:00
Nicolas Prevot
e702404c5a
DO NOT MERGE
...
Remove cross-profile intent filters when removing a user.
When a user is being removed: removing cross-profile intent filters that have
this user as their source.
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.
Change-Id: Ie3a2aa0cbbe6c9eb9e945e650fd907e5cc012409
(cherry picked from commit d44e2d7340c70406d8b5eb8b3d6c6c0daaa8705f)
2014-07-17 13:44:56 +00:00
Filip Gruszczynski
31a37dc0a1
am 95198b91: am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
...
* commit '95198b91665bb93473ea1ec68c69bdbfd0002d49':
Using outset bottom from theme as bottom inset on circular screens.
2014-07-17 13:37:25 +00:00
Justin Koh
0a93106964
am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev
...
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
Additional cleanup after stack deletion.
2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f
am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev
...
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
Wait for all windows to draw before turning screen on
2014-07-17 10:55:56 +00:00
Filip Gruszczynski
95198b9166
am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
...
* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
Using outset bottom from theme as bottom inset on circular screens.
2014-07-17 10:55:43 +00:00
Julia Reynolds
38d3c26fd5
Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev
2014-07-17 07:39:11 +00:00
Julia Reynolds
5b8224901b
Update message on DISALLOW_REMOVE_USERS constant.
...
Change-Id: I4f873eba4082278553ded830bb902fb3a3195d87
2014-07-17 11:50:05 -04:00
John Spurlock
969265af31
Merge "Zen: Maintain selection throughout rocker session." into lmp-dev
2014-07-17 07:39:11 +00:00
John Spurlock
fbb3d6ff39
Zen: Maintain selection throughout rocker session.
...
While the panel is visible, allow toggling between
none + priority (and even 'all') without resetting
the exit condition.
Bug:16350606
Change-Id: I830be8ccad1ba95a64239f00a72f773c4fe739f2
2014-07-17 12:09:05 -04:00
John Spurlock
4d6d722017
Merge "Zen: Return of the alarm warning." into lmp-dev
2014-07-17 07:39:11 +00:00
John Spurlock
89f060a1e0
Zen: Return of the alarm warning.
...
- Remove the term timers from subtitle, the term "alarms"
is now inclusive of timers.
- Resurrect the alarm warning, give it a more prominent
appearance if we can detect an overlap in a time-based
exit condition and the next alarm time.
Change-Id: I5d6d67694c7acc9e2a5a7c63e647069744a22cec
2014-07-17 11:41:18 -04:00
John Spurlock
f83fc9b48f
Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev
2014-07-17 07:12:45 +00:00
John Spurlock
07f6d3b6dd
Shade: Hide the status icons from the collapsed header.
...
Only show wifi / cell / battery / user, the entire statusIcons
layout s/b hidden when reparented to the header.
Bug:16355667
Change-Id: I4c99ffed82af47c4e67e7915a8cb98fc04ad7017
2014-07-17 10:44:34 -04:00
Dianne Hackborn
fee756ff91
Implement issue #16330060 : Inform ActivityManager about WebView...
...
...state changes.
Add a new API to tell the activity manager about a new dependency
one process has on another package. Start using it already for
when apps is Context.createPackageContext() to load code from another
app.
Also do some work on getting the monitoring of proc/uid states
in shape so it can be used by unundled code, along with an
AppImportanceMonitor class for doing so.
Some small fixes and additions to VoiceInteractionService.
Improve handling of unaccounted/overcounted battery use so that
they aren't shown to the user unless they are significant.
Change-Id: I22dd79a73f4e70103d3f8964494aebc8a31f971c
2014-07-16 22:50:31 -07:00
Ji-Hwan Lee
66bdf247df
TIF: Add TvInputInfo.getParentId
...
Bug: 16166859
Change-Id: I07130b6f974ca7b2527aba68b92dc31fb4b5a139
2014-07-17 14:40:31 +09:00
Sandeep Siddhartha
2883ba6975
Plumb the database code to read/update sound models
...
Change-Id: I135131b042481462f905bdb69ea8544e2561d177
2014-07-16 22:10:45 -07:00
Sandeep Siddhartha
e6cd2476aa
Add recognition modes to the enrollment metadata
...
This will be used by the Voice interaction service to determine what type of recognition may be run
on the DSP. e.g. If the DSP supports voice trigger only for the given keyphrase,
the voice interaction service may want to perform user identification at its end.
Also support keyphrase metadata for all keyphrases and locales.
In case the enrollment app supports open-ended keyphrases, it can leave the keyphrase text
to be empty
similarly, if the enrollment app supports all locales, it can leave the supported locales
attribute to be empty,
Change-Id: I782a17a877fc79ed569fa7c3a81697641182590b
2014-07-16 22:03:03 -07:00
Alan Viverette
5134478151
Add public attributes for TimePicker styling
...
BUG: 11218747
Change-Id: Ifdf981280ebe20a9066f219c9a4505d0d7486b2e
2014-07-17 04:36:11 +00:00
Chulwoo Lee
5130655bcb
Merge "Pass input ID to the setup/settings activity" into lmp-dev
2014-07-17 04:18:22 +00:00
Chulwoo Lee
3b2f507910
Merge "Introduce "input_id" column to the channels table" into lmp-dev
2014-07-17 04:15:25 +00:00
Amith Yamasani
ed239cb950
Keep track of user_setup_complete in DPMS
...
This is to ensure that some system app can't modify that
state for purposes of changing the profile owner without
user consent.
Bug: 16207721
Change-Id: Ic5f454d7568cd824b83456eed0e2611779a9adf8
2014-07-16 20:36:41 -07:00
Sandeep Siddhartha
a433af6b73
Add code for isKeyphraseActive and some logging to help debug issues
...
Change-Id: I89f2090be5a5fe5f7c0da1648a0d46a093893fe2
2014-07-16 19:52:32 -07:00
Eino-Ville Talvala
7040e9f7fe
Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
2014-07-17 02:40:09 +00:00
Eino-Ville Talvala
611fecec08
Add PackageManager features for differentiating camera2 devices
...
Also rename DNG capability to RAW.
Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
2014-07-17 10:58:16 -07:00
Amith Yamasani
bb4d6a20bd
Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
2014-07-17 02:34:24 +00:00
Amith Yamasani
390989da19
Split telephony restrictions into outgoing calls and sms
...
DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced
DISALLOW_SMS.
Outgoing emergency calls should always be permitted.
Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
2014-07-17 12:14:52 -07:00
Andrew Lee
e7a7ec6db5
Merge "Pass through video state when answering a call." into lmp-dev
2014-07-17 02:29:54 +00:00
Andrew Lee
8da4c3c11f
Pass through video state when answering a call.
...
Bug: 16013878
Bug: 16015750
Change-Id: Ia9ba6e5f78fcb64e1089db99f5ce11d0ef858ac9
2014-07-17 12:56:49 -07:00
Lorenzo Colitti
20ceb90373
Disable logging in NetlinkTracker.
...
This logging can get quite spammy in GoogleGuest, and there's
currently no reason to think it's necessary. Much of the same
information is available via "adb shell ndc monitor".
Bug: 16328180
Change-Id: I15a8348e261d6b69a4ef8bdaf8a2a431b1c2bc0d
2014-07-17 01:43:39 +00:00
Santos Cordon
98b270309a
Add toString & equals helper methods to PhoneAccount.java
...
Bug: 16292368
Change-Id: I5dd2bcd2d65e856107ac2f80958e8b408abcec0b
2014-07-17 01:21:23 +00:00
Adrian Roos
9d32507a86
Merge "Update QS user switcher colors to spec" into lmp-dev
2014-07-17 00:15:07 +00:00