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
Dan Sandler
4ec3b0f9ab
Merge "Badge largeIcons with the notification icon."
2014-05-16 15:18:40 +00:00
Adrian Roos
3242f51c93
Merge "Apply revised TrustAgent API"
2014-05-16 14:32:07 +00:00
Dan Sandler
190d58d621
Badge largeIcons with the notification icon.
...
The old right-hand small icon is no more; instead the
notification's small icon is overlaid atop the largeIcon
bitmap.
If the small icon would have had a colored circle background
applied to it in the large left-hand slot, it gets a similar
treatment when used as a badge.
Change-Id: I8b262afbdd4faab2beffd294d662f4759f35f3b3
2014-05-16 10:07:54 -04:00
Adrian Roos
7e03dfcb79
Apply revised TrustAgent API
...
Bug: 14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c
2014-05-16 16:06:28 +02:00
Dan Sandler
574ed553b0
Merge "Remove unneeded layouts."
2014-05-16 13:07:13 +00:00
Ben Murdoch
0e04bcfbdc
Fallback to NullWebView when Chromium WebView not present.
...
If it's not possible to load the Chromium WebView, fallback to loading
the NullWebView that will throw UnsupportedOperationException.
Bug: 13438487
Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
2014-05-16 13:41:12 +01:00
Narayan Kamath
3bd2c6ffea
am b4606676: am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow."
...
* commit 'b4606676a8e357f7b6de049099a04438f7c1b4eb':
Init the static member when first used for CursorWindow.
2014-05-16 12:34:48 +00:00
Narayan Kamath
b4606676a8
am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow."
...
* commit '49538def98520eb57d4fb634bf09b2f3104e7953':
Init the static member when first used for CursorWindow.
2014-05-16 12:29:59 +00:00
Narayan Kamath
49538def98
am 79e0206e: Merge "Init the static member when first used for CursorWindow."
...
* commit '79e0206ef3203a1842949242e58fa8f3c25eb129':
Init the static member when first used for CursorWindow.
2014-05-16 12:26:34 +00:00
Narayan Kamath
79e0206ef3
Merge "Init the static member when first used for CursorWindow."
2014-05-16 12:24:33 +00:00
Narayan Kamath
d75f1efcb9
am 0c42f3bb: (-s ours) am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit '0c42f3bb33ae4bc467d39e2f15cfff795409508b':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:18:50 +00:00
Narayan Kamath
0c42f3bb33
am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit '2c125876208c6b7173ef561316843d64ae1599e2':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:13:49 +00:00
Narayan Kamath
2c12587620
am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit '8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:08:09 +00:00
Narayan Kamath
8a196c0676
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
2014-05-16 12:06:09 +00:00
Narayan Kamath
844a4c81ff
Change InputMessage.motion.pointerSize to a uint32_t.
...
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from commit bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
2014-05-16 12:55:48 +01:00
Kenny Guy
6f16aec6de
Merge "Send profile removed intent earlier so launchers updates."
2014-05-16 11:47:49 +00:00
Selim Cinek
51dbce80ea
Merge "Improved Notification Panel height logic"
2014-05-16 11:34:18 +00:00
Jungshik Jang
b0650e8ff3
Merge "Add ARC commands"
2014-05-16 06:49:18 +00:00
Griff Hazen
959591e3ba
Add support for extendable actions to Notification.
...
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
2014-05-15 22:26:18 -07:00
Dan Sandler
4b069cc896
Remove unneeded layouts.
...
Change-Id: I46fdb4ed07f67c749f0a7e62c7d9a657aa8e44e3
2014-05-16 01:13:53 -04:00
Todd Poynor
540f4d6db3
BatteryManager: Add property ENERGY_COUNTER and long data type properties
...
Change-Id: Ie7f9b19c5cd47a48bb33af03d51acddaa14b0243
2014-05-16 03:04:33 +00:00
Sungsoo Lim
07d5e7d5fa
Merge "Implements TtmlRenderer."
2014-05-16 01:56:17 +00:00
Jerome Poichet
8d56ff8b70
Merge "Adding Activity Action entry"
2014-05-16 01:38:33 +00:00
Deepanshu Gupta
fba1dd24bf
LayoutLib: Correctly resolve ?attr/foo
...
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.
Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
2014-05-15 17:37:34 -07:00
Chris Craik
c9ee304c91
Merge "Round rect outline clipping"
2014-05-16 00:37:29 +00:00
vandwalle
6c536eac59
Merge "autojoin fix for devices which are using the enableNEtwork API"
2014-05-16 00:21:29 +00:00
Selim Gurun
9f29702361
Merge "Webview Cleanup part 2"
2014-05-16 00:20:48 +00:00
Robert Greenwalt
00bcf01a91
Merge "Add net.dns system properties"
2014-05-16 00:06:41 +00:00
Chris Craik
deeda3d337
Round rect outline clipping
...
Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
2014-05-15 16:36:12 -07:00