Evan Charlton
605a07be7b
Merge "Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."""
2014-05-16 20:39:02 +00:00
Evan Charlton
695085c7f2
Merge "Revert "Revert "Expose sendEnvelope."""
2014-05-16 20:38:57 +00:00
Evan Charlton
b8894ab1ae
Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
...
This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750.
Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
2014-05-16 13:31:26 -07:00
Alan Viverette
62cb534edb
Merge "Update ripple behavior, use render thread animation"
2014-05-16 20:29:08 +00:00
Alan Viverette
ad2f8e334f
Update ripple behavior, use render thread animation
...
Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
2014-05-16 13:28:33 -07:00
Deepanshu Gupta
779b59ced2
Merge "Add a script to rename fonts for SDK."
2014-05-16 20:27:11 +00:00
Adrian Roos
4b0ec7e924
Merge "Trust Agents: Withhold trust until user has authenticated"
2014-05-16 20:13:30 +00:00
Adrian Roos
dc0d5d1850
Merge "Trust Agents: Implement DPM override"
2014-05-16 20:13:20 +00:00
Alan Viverette
22fc9e4a24
Merge "Add drawable padding to check box and radio button styles"
2014-05-16 20:04:44 +00:00
Evan Charlton
210889e91c
Revert "Revert "Expose sendEnvelope.""
...
This reverts commit 23745256000bffaad4038ad9fe6e2b0941074a53.
2014-05-16 12:50:13 -07:00
Dianne Hackborn
3fce73a866
Merge "Fix recording of wake_lock_in."
2014-05-16 19:42:54 +00:00
Amith Yamasani
891e65c5ce
Merge "Variant of sendBroadcast with appOp flag for cross-user."
2014-05-16 19:40:20 +00:00
Amith Yamasani
3cf75729d5
Variant of sendBroadcast with appOp flag for cross-user.
...
Needed for delivering SMS notifications to multiple users.
Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
2014-05-16 12:37:29 -07:00
Deepanshu Gupta
ad3f288311
Add a script to rename fonts for SDK.
...
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.
Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
2014-05-16 12:31:24 -07:00
Adrian Roos
7046bfd054
Trust Agents: Withhold trust until user has authenticated
...
Bug: 14229695
Change-Id: I40d9fa442aa05437c20081c007ed64f984042418
2014-05-16 21:24:29 +02:00
Selim Gurun
4455f54b5b
Merge "Add a setting for data reduction proxy key"
2014-05-16 19:09:10 +00:00
Jason Monk
20f98b0561
Merge "Fix NPE in DevicePolicyManagerService"
2014-05-16 18:59:58 +00:00
Raph Levien
e517ce4563
Merge "Get rid of dirFlags log spam"
2014-05-16 18:59:03 +00:00
Jason Monk
9fcff5aadd
Fix NPE in DevicePolicyManagerService
...
Bug: 15015897
Change-Id: Id9f6ae8b5abf96d35f799b150210813fb52da54c
2014-05-16 14:56:57 -04:00
Raph Levien
b98de0dcd6
Get rid of dirFlags log spam
...
I was logging the BiDi flags for debugging, did not mean to commit this.
Change-Id: I0a89c68fe17562f2ed38843efacbaa310dca24fa
2014-05-16 11:50:50 -07:00
Selim Gurun
178201f7ff
Add a setting for data reduction proxy key
...
Bug: 12492817
Change-Id: I15c42d631f6ba9ab4dcce38e96f0486efaf3d22f
2014-05-16 11:50:37 -07:00
Igor Murashkin
9d08a93b2d
Merge "camera2: Move parameters around to different packages"
2014-05-16 18:08:41 +00:00
Deepanshu Gupta
528d876821
Merge "LayoutLib: Correctly resolve ?attr/foo"
2014-05-16 18:04:15 +00:00
Dianne Hackborn
9a75543006
Fix recording of wake_lock_in.
...
There was a bug that would allow the nesting count
to get off. Also better documentation of times in
HistoryItem, and new option to disable resetting of
the stats when unplugging.
Change-Id: If1b39a02475c5b620c67b700a323a6d0462d5c61
2014-05-16 10:46:33 -07:00
Griff Hazen
a13bfae217
am cfa27161: am 50c11659: Fix Notification sdk docs build.
...
* commit 'cfa271618f5b33eae200c97c6c3624df9d04efc2':
Fix Notification sdk docs build.
2014-05-16 17:41:28 +00:00
John Reck
6d6ce03a03
resolved conflicts for merge of 313c5f38 to master
...
Conflicts:
core/java/android/view/HardwareRenderer.java
Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd
2014-05-16 10:38:14 -07:00
Matthew Williams
691e93e82c
TM TaskServiceContext implementation
...
Each task is run on the client from within a TaskServiceContext.
TSC tracks the state of execution of each task on the client.
Change-Id: I93c306a83c1115559f4e9675d9997dceae3f186a
2014-05-16 10:33:48 -07:00
Jason Monk
8974f24909
Merge "Notify AppOpsService of UserRestrictions and Owners"
2014-05-16 17:30:31 +00:00
Dan Sandler
843adbba6a
Merge "Missing progress bar style."
2014-05-16 17:30:21 +00:00
Griff Hazen
2c255a9505
Merge "resolved conflicts for merge of de35b636 to master"
2014-05-16 17:26:06 +00:00
Dan Sandler
aaa480028b
Missing progress bar style.
...
Change-Id: Id6945ceabc9ead85d151d8827984172d4bdaecb0
2014-05-16 13:25:36 -04:00
Robert Greenwalt
fcfef283d8
Merge "Clean up when we switch networks."
2014-05-16 17:16:19 +00:00
Dan Sandler
1c62e72ada
Merge "Updated typography for notifications."
2014-05-16 17:16:16 +00:00
Dan Sandler
206ec09da8
Merge "Enable tinting of notification backgrounds."
2014-05-16 17:15:31 +00:00
Griff Hazen
c091ba8dd0
resolved conflicts for merge of de35b636 to master
...
Conflicts:
core/java/android/app/Notification.java
Change-Id: I39ace14c976431bd7f6f1f9d5e4174b0a100aab0
2014-05-16 10:13:26 -07:00
Jason Monk
62062996dd
Notify AppOpsService of UserRestrictions and Owners
...
This makes the DevicePolicyManagerService and UserManagerService
push the DeviceOwner/ProfileOwners and user restrictions on boot
as well as on any change.
This also adds a list of restrictions that allow any op to connected with
a user restriction such that it will return MODE_IGNORED when the user
restriction is present (except for the device/profile owner).
Change-Id: Id8a9591d8f04fe5ecebd95750d9010afc0cd786c
2014-05-16 13:12:41 -04:00
Griff Hazen
cfa271618f
am 50c11659: Fix Notification sdk docs build.
...
* commit '50c11659f0f971e1a6b0adde59247f5de370b74d':
Fix Notification sdk docs build.
2014-05-16 16:56:47 +00:00
Adrian Roos
ca36b95bd3
Trust Agents: Implement DPM override
...
Disable trust agents when a device policy
disabling them is in effect.
Bug: 14619289
Change-Id: I0920a17021cbf045d2362735df49ef4d013fcc7f
2014-05-16 18:52:29 +02:00
Griff Hazen
50c11659f0
Fix Notification sdk docs build.
...
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.
Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
2014-05-16 09:46:31 -07:00
Jean-Michel Trivi
c40c0c9d9c
Merge "AudioTrack JNI cleanup"
2014-05-16 16:04:00 +00:00
John Reck
313c5f38e8
am f18aed83: am 0661ddee: Merge "Enable display list updates with zero delta time"
...
* commit 'f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
Enable display list updates with zero delta time
2014-05-16 16:00:09 +00:00
John Reck
f18aed83f6
am 0661ddee: Merge "Enable display list updates with zero delta time"
...
* commit '0661ddee112477db180d65e605f34fd538fdf8bc':
Enable display list updates with zero delta time
2014-05-16 15:56:07 +00:00
Robert Greenwalt
4064af844c
Clean up when we switch networks.
...
Need to unhitch mNetworkForRequestId when a network is no longer
satisfying a request.
Change-Id: I3b3cde7dd92ec87a76ae7a0825ad22e892fa8fd5
2014-05-16 08:54:07 -07:00
Dan Sandler
fc339ecb54
Updated typography for notifications.
...
Title: 16dp Roboto Regular 87% alpha
Text: 13dp Roboto Regular 60% alpha
Data/time: 12dp Roboto Regular 60% alpha
Emphasis: 12dp Roboto Regular 40% alpha
Change-Id: Ia4ef3131161229f206287f267593e8952a528d7b
2014-05-16 11:52:10 -04:00
Dan Sandler
fe266a3cb3
Enable tinting of notification backgrounds.
...
(Turns out gray text doesn't look so hot on tinted
backgrounds, so this CL switches it to alpha-black of an
equivalent intensity.)
Change-Id: Ia2b7e24b72849bd31bfbd0ce948a6c92233f2b9e
2014-05-16 11:51:57 -04:00
John Reck
0661ddee11
Merge "Enable display list updates with zero delta time"
2014-05-16 15:51:39 +00:00
Przemyslaw Szczepaniak
067a21b246
TTS Connection callbacks are called on main thread.
...
After experimenting with the new TTS API I found out that receiving
ConnectionCallbacks#onEngineStatusChange and #onServiceDisconnected
callbacks on non-main thread are problematic. They are very rare and
overhead of dealing with them in separate thread is high - in most
cases user just wants to process those callbacks in the main thread
context. This change should make new API usage easier.
+ Fixed default values of speech speed in voices from v1->v2 wrapper.
Change-Id: I76d3b607b3b931b7eb10aa180775fd3607c43bd9
2014-05-16 16:47:46 +01:00
Griff Hazen
de35b636df
am 959591e3: Add support for extendable actions to Notification.
...
* commit '959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
Add support for extendable actions to Notification.
2014-05-16 15:40:18 +00:00
Chris Wren
c5a88944f0
Merge "Extend NotificationListenerService to support system use cases."
2014-05-16 15:31:23 +00:00
Chris Wren
1941fc7186
Extend NotificationListenerService to support system use cases.
...
Bug: 14846846
Change-Id: Ic308b2f78c86393304d446c57fd677294e01717c
2014-05-16 11:23:50 -04:00