OSDN Git Service
John Reck [Fri, 16 May 2014 21:47:32 +0000 (21:47 +0000)]
Merge "Add missing fence()"
John Reck [Fri, 16 May 2014 21:46:07 +0000 (14:46 -0700)]
Add missing fence()
Bug:
14995924
Change-Id: I991fe74f01468b1b7e34aee0455dc419637f5c8d
Selim Cinek [Fri, 16 May 2014 21:43:29 +0000 (21:43 +0000)]
Merge "Implemented visual speed-bump for notifications."
Selim Cinek [Wed, 14 May 2014 08:23:33 +0000 (10:23 +0200)]
Implemented visual speed-bump for notifications.
The separation between the important and the less important
notifications has now a visual representation.
Bug:
14607473
Change-Id: I8baa0a08924ec041be2884a2834139477313ab40
Matthew Williams [Fri, 16 May 2014 20:48:46 +0000 (20:48 +0000)]
Merge "TM TaskServiceContext implementation"
Evan Charlton [Fri, 16 May 2014 20:39:02 +0000 (20:39 +0000)]
Merge "Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."""
Evan Charlton [Fri, 16 May 2014 20:38:57 +0000 (20:38 +0000)]
Merge "Revert "Revert "Expose sendEnvelope."""
Evan Charlton [Fri, 16 May 2014 20:31:26 +0000 (13:31 -0700)]
Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
This reverts commit
f743b163fc764b7ebf701a9e65b13d308530d750.
Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
Alan Viverette [Fri, 16 May 2014 20:29:08 +0000 (20:29 +0000)]
Merge "Update ripple behavior, use render thread animation"
Alan Viverette [Fri, 16 May 2014 20:28:33 +0000 (13:28 -0700)]
Update ripple behavior, use render thread animation
Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
Deepanshu Gupta [Fri, 16 May 2014 20:27:10 +0000 (20:27 +0000)]
Merge "Add a script to rename fonts for SDK."
Adrian Roos [Fri, 16 May 2014 20:13:30 +0000 (20:13 +0000)]
Merge "Trust Agents: Withhold trust until user has authenticated"
Adrian Roos [Fri, 16 May 2014 20:13:18 +0000 (20:13 +0000)]
Merge "Trust Agents: Implement DPM override"
Alan Viverette [Fri, 16 May 2014 20:04:44 +0000 (20:04 +0000)]
Merge "Add drawable padding to check box and radio button styles"
Evan Charlton [Fri, 16 May 2014 19:50:13 +0000 (12:50 -0700)]
Revert "Revert "Expose sendEnvelope.""
This reverts commit
23745256000bffaad4038ad9fe6e2b0941074a53.
Dianne Hackborn [Fri, 16 May 2014 19:42:53 +0000 (19:42 +0000)]
Merge "Fix recording of wake_lock_in."
Amith Yamasani [Fri, 16 May 2014 19:40:20 +0000 (19:40 +0000)]
Merge "Variant of sendBroadcast with appOp flag for cross-user."
Amith Yamasani [Fri, 16 May 2014 19:37:29 +0000 (12:37 -0700)]
Variant of sendBroadcast with appOp flag for cross-user.
Needed for delivering SMS notifications to multiple users.
Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
Deepanshu Gupta [Fri, 16 May 2014 01:39:30 +0000 (18:39 -0700)]
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
Adrian Roos [Fri, 16 May 2014 19:20:54 +0000 (21:20 +0200)]
Trust Agents: Withhold trust until user has authenticated
Bug:
14229695
Change-Id: I40d9fa442aa05437c20081c007ed64f984042418
Selim Gurun [Fri, 16 May 2014 19:09:10 +0000 (19:09 +0000)]
Merge "Add a setting for data reduction proxy key"
Jason Monk [Fri, 16 May 2014 18:59:57 +0000 (18:59 +0000)]
Merge "Fix NPE in DevicePolicyManagerService"
Raph Levien [Fri, 16 May 2014 18:59:03 +0000 (18:59 +0000)]
Merge "Get rid of dirFlags log spam"
Jason Monk [Fri, 16 May 2014 18:56:17 +0000 (14:56 -0400)]
Fix NPE in DevicePolicyManagerService
Bug:
15015897
Change-Id: Id9f6ae8b5abf96d35f799b150210813fb52da54c
Raph Levien [Fri, 16 May 2014 18:50:50 +0000 (11:50 -0700)]
Get rid of dirFlags log spam
I was logging the BiDi flags for debugging, did not mean to commit this.
Change-Id: I0a89c68fe17562f2ed38843efacbaa310dca24fa
Selim Gurun [Fri, 16 May 2014 18:38:44 +0000 (11:38 -0700)]
Add a setting for data reduction proxy key
Bug:
12492817
Change-Id: I15c42d631f6ba9ab4dcce38e96f0486efaf3d22f
Igor Murashkin [Fri, 16 May 2014 18:08:41 +0000 (18:08 +0000)]
Merge "camera2: Move parameters around to different packages"
Deepanshu Gupta [Fri, 16 May 2014 18:04:14 +0000 (18:04 +0000)]
Merge "LayoutLib: Correctly resolve ?attr/foo"
Dianne Hackborn [Fri, 16 May 2014 00:05:22 +0000 (17:05 -0700)]
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
Griff Hazen [Fri, 16 May 2014 17:41:28 +0000 (17:41 +0000)]
am
cfa27161: am
50c11659: Fix Notification sdk docs build.
* commit '
cfa271618f5b33eae200c97c6c3624df9d04efc2':
Fix Notification sdk docs build.
John Reck [Fri, 16 May 2014 17:37:39 +0000 (10:37 -0700)]
resolved conflicts for merge of
313c5f38 to master
Conflicts:
core/java/android/view/HardwareRenderer.java
Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd
Matthew Williams [Mon, 12 May 2014 22:33:09 +0000 (15:33 -0700)]
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
Jason Monk [Fri, 16 May 2014 17:30:30 +0000 (17:30 +0000)]
Merge "Notify AppOpsService of UserRestrictions and Owners"
Dan Sandler [Fri, 16 May 2014 17:30:21 +0000 (17:30 +0000)]
Merge "Missing progress bar style."
Griff Hazen [Fri, 16 May 2014 17:26:06 +0000 (17:26 +0000)]
Merge "resolved conflicts for merge of
de35b636 to master"
Dan Sandler [Fri, 16 May 2014 17:25:05 +0000 (13:25 -0400)]
Missing progress bar style.
Change-Id: Id6945ceabc9ead85d151d8827984172d4bdaecb0
Robert Greenwalt [Fri, 16 May 2014 17:16:19 +0000 (17:16 +0000)]
Merge "Clean up when we switch networks."
Dan Sandler [Fri, 16 May 2014 17:16:16 +0000 (17:16 +0000)]
Merge "Updated typography for notifications."
Dan Sandler [Fri, 16 May 2014 17:15:31 +0000 (17:15 +0000)]
Merge "Enable tinting of notification backgrounds."
Griff Hazen [Fri, 16 May 2014 17:13:26 +0000 (10:13 -0700)]
resolved conflicts for merge of
de35b636 to master
Conflicts:
core/java/android/app/Notification.java
Change-Id: I39ace14c976431bd7f6f1f9d5e4174b0a100aab0
Jason Monk [Tue, 6 May 2014 13:55:28 +0000 (09:55 -0400)]
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
Griff Hazen [Fri, 16 May 2014 16:56:47 +0000 (16:56 +0000)]
am
50c11659: Fix Notification sdk docs build.
* commit '
50c11659f0f971e1a6b0adde59247f5de370b74d':
Fix Notification sdk docs build.
Adrian Roos [Fri, 16 May 2014 16:52:29 +0000 (18:52 +0200)]
Trust Agents: Implement DPM override
Disable trust agents when a device policy
disabling them is in effect.
Bug:
14619289
Change-Id: I0920a17021cbf045d2362735df49ef4d013fcc7f
Griff Hazen [Fri, 16 May 2014 16:46:31 +0000 (09:46 -0700)]
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
Jean-Michel Trivi [Fri, 16 May 2014 16:04:00 +0000 (16:04 +0000)]
Merge "AudioTrack JNI cleanup"
John Reck [Fri, 16 May 2014 16:00:09 +0000 (16:00 +0000)]
am
f18aed83: am
0661ddee: Merge "Enable display list updates with zero delta time"
* commit '
f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
Enable display list updates with zero delta time
John Reck [Fri, 16 May 2014 15:56:07 +0000 (15:56 +0000)]
am
0661ddee: Merge "Enable display list updates with zero delta time"
* commit '
0661ddee112477db180d65e605f34fd538fdf8bc':
Enable display list updates with zero delta time
Robert Greenwalt [Fri, 16 May 2014 15:54:07 +0000 (08:54 -0700)]
Clean up when we switch networks.
Need to unhitch mNetworkForRequestId when a network is no longer
satisfying a request.
Change-Id: I3b3cde7dd92ec87a76ae7a0825ad22e892fa8fd5
Dan Sandler [Fri, 16 May 2014 15:42:41 +0000 (11:42 -0400)]
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
Dan Sandler [Fri, 16 May 2014 02:28:06 +0000 (22:28 -0400)]
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
John Reck [Fri, 16 May 2014 15:51:38 +0000 (15:51 +0000)]
Merge "Enable display list updates with zero delta time"
Griff Hazen [Fri, 16 May 2014 15:40:18 +0000 (15:40 +0000)]
am
959591e3: Add support for extendable actions to Notification.
* commit '
959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
Add support for extendable actions to Notification.
Chris Wren [Fri, 16 May 2014 15:31:23 +0000 (15:31 +0000)]
Merge "Extend NotificationListenerService to support system use cases."
Chris Wren [Wed, 14 May 2014 19:20:51 +0000 (15:20 -0400)]
Extend NotificationListenerService to support system use cases.
Bug:
14846846
Change-Id: Ic308b2f78c86393304d446c57fd677294e01717c
Dan Sandler [Fri, 16 May 2014 15:18:39 +0000 (15:18 +0000)]
Merge "Badge largeIcons with the notification icon."
Adrian Roos [Fri, 16 May 2014 14:32:06 +0000 (14:32 +0000)]
Merge "Apply revised TrustAgent API"
Dan Sandler [Thu, 15 May 2014 13:33:39 +0000 (09:33 -0400)]
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
Adrian Roos [Fri, 16 May 2014 14:06:28 +0000 (16:06 +0200)]
Apply revised TrustAgent API
Bug:
14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c
Dan Sandler [Fri, 16 May 2014 13:07:12 +0000 (13:07 +0000)]
Merge "Remove unneeded layouts."
Narayan Kamath [Fri, 16 May 2014 12:34:48 +0000 (12:34 +0000)]
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.
Narayan Kamath [Fri, 16 May 2014 12:29:59 +0000 (12:29 +0000)]
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.
Narayan Kamath [Fri, 16 May 2014 12:26:34 +0000 (12:26 +0000)]
am
79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '
79e0206ef3203a1842949242e58fa8f3c25eb129':
Init the static member when first used for CursorWindow.
Narayan Kamath [Fri, 16 May 2014 12:24:32 +0000 (12:24 +0000)]
Merge "Init the static member when first used for CursorWindow."
Narayan Kamath [Fri, 16 May 2014 12:18:50 +0000 (12:18 +0000)]
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.
Narayan Kamath [Fri, 16 May 2014 12:13:49 +0000 (12:13 +0000)]
am
2c125876: am
8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
2c125876208c6b7173ef561316843d64ae1599e2':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:08:09 +0000 (12:08 +0000)]
am
8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:06:09 +0000 (12:06 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
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
Kenny Guy [Fri, 16 May 2014 11:47:48 +0000 (11:47 +0000)]
Merge "Send profile removed intent earlier so launchers updates."
Selim Cinek [Fri, 16 May 2014 11:34:18 +0000 (11:34 +0000)]
Merge "Improved Notification Panel height logic"
Jungshik Jang [Fri, 16 May 2014 06:49:17 +0000 (06:49 +0000)]
Merge "Add ARC commands"
Griff Hazen [Fri, 16 May 2014 05:26:18 +0000 (22:26 -0700)]
Add support for extendable actions to Notification.
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
Dan Sandler [Thu, 8 May 2014 05:18:54 +0000 (01:18 -0400)]
Remove unneeded layouts.
Change-Id: I46fdb4ed07f67c749f0a7e62c7d9a657aa8e44e3
Todd Poynor [Thu, 8 May 2014 22:12:50 +0000 (15:12 -0700)]
BatteryManager: Add property ENERGY_COUNTER and long data type properties
Change-Id: Ie7f9b19c5cd47a48bb33af03d51acddaa14b0243
Sungsoo Lim [Fri, 16 May 2014 01:56:17 +0000 (01:56 +0000)]
Merge "Implements TtmlRenderer."
Jerome Poichet [Fri, 16 May 2014 01:38:33 +0000 (01:38 +0000)]
Merge "Adding Activity Action entry"
Deepanshu Gupta [Fri, 16 May 2014 00:37:34 +0000 (17:37 -0700)]
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
Chris Craik [Fri, 16 May 2014 00:37:28 +0000 (00:37 +0000)]
Merge "Round rect outline clipping"
vandwalle [Fri, 16 May 2014 00:21:28 +0000 (00:21 +0000)]
Merge "autojoin fix for devices which are using the enableNEtwork API"
Selim Gurun [Fri, 16 May 2014 00:20:47 +0000 (00:20 +0000)]
Merge "Webview Cleanup part 2"
Robert Greenwalt [Fri, 16 May 2014 00:06:40 +0000 (00:06 +0000)]
Merge "Add net.dns system properties"
Chris Craik [Tue, 6 May 2014 02:09:33 +0000 (19:09 -0700)]
Round rect outline clipping
Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
Robert Greenwalt [Thu, 15 May 2014 23:32:51 +0000 (23:32 +0000)]
Merge "Remove unneed clear in constructor."
Robert Greenwalt [Thu, 15 May 2014 22:27:13 +0000 (15:27 -0700)]
Add net.dns system properties
Some apps rely on them.
bug:
14992618
Change-Id: I5766f26b77004e9cfcc90fac657817eab67f9ac7
vandwalle [Thu, 15 May 2014 21:25:18 +0000 (14:25 -0700)]
autojoin fix for devices which are using the enableNEtwork API
Bug:
15000352
Change-Id: Ib8b5dfd517e48444913f0ad0e5d08749d6eaa757
Alan Viverette [Thu, 15 May 2014 23:11:48 +0000 (23:11 +0000)]
Merge "Deprecate FragmentBreadCrumbs, remove styles add in L"
RoboErik [Thu, 15 May 2014 23:08:25 +0000 (23:08 +0000)]
Merge "Add UserRecords to separate user interactions"
Selim Gurun [Thu, 15 May 2014 22:55:30 +0000 (15:55 -0700)]
Webview Cleanup part 2
Bug:
1231013
Move classes only needed by Browser to browser package.
Change-Id: I7c8080a74a15c06040e0ac0d4b713afbfd02e2e0
Alan Viverette [Thu, 15 May 2014 23:04:05 +0000 (16:04 -0700)]
Deprecate FragmentBreadCrumbs, remove styles add in L
Adds comments to the private styles so that we don't try to
update them again in the future.
BUG:
14997266
Change-Id: I0099063d1ce254682aff6bcdd051ebf8719d562b
Jeff Davidson [Thu, 15 May 2014 22:54:00 +0000 (22:54 +0000)]
Merge "Fix inconsistent package name."
Jeff Davidson [Thu, 15 May 2014 22:52:04 +0000 (15:52 -0700)]
Fix inconsistent package name.
Change-Id: I6dfa0ded4309ae9e3f8ab73d96e6ccb521beb7c4
Adam Powell [Thu, 15 May 2014 22:39:31 +0000 (22:39 +0000)]
Merge "Update mismerged current.txt"
Adam Powell [Thu, 15 May 2014 22:38:37 +0000 (15:38 -0700)]
Update mismerged current.txt
Change-Id: If16b714ef4cfcdc3c63cf21159390040237a3e78
Deepanshu Gupta [Thu, 15 May 2014 22:36:40 +0000 (22:36 +0000)]
Merge "Layoutlib: Update delegates for L"
Alan Viverette [Thu, 15 May 2014 22:13:36 +0000 (22:13 +0000)]
Merge "Ensure volume preference has correct defStyleAttr"
Adam Powell [Thu, 15 May 2014 03:13:47 +0000 (20:13 -0700)]
Add content insets to Toolbar
Content insets allow a Toolbar to define horizontal gridlines for the
start/end or left/right edges of major content (not counting the
navigation button or menu). This allows apps to align their layout
content above or below a Toolbar with the title and other contents of
the bar by using app-defined measurements.
Change-Id: Ibd7e0810bf81070eb5f59a42ad3257f35bc0156a
Alan Viverette [Thu, 15 May 2014 22:03:36 +0000 (15:03 -0700)]
Ensure volume preference has correct defStyleAttr
BUG:
14635756
Change-Id: Id78da5df3d355a4dda9bd1b80b14df54803d5d03
Dianne Hackborn [Thu, 15 May 2014 21:57:27 +0000 (21:57 +0000)]
Merge "Battery stats more wake history, power save mode."
Adam Lesinski [Thu, 15 May 2014 21:17:32 +0000 (21:17 +0000)]
Merge "AAPT dump badging should allow refs in meta-data"
Adam Lesinski [Thu, 15 May 2014 21:14:41 +0000 (14:14 -0700)]
AAPT dump badging should allow refs in meta-data
The framework allows references in the <meta-data>
element in an AndroidManifest.xml, so badging should
do the same.
Bug:
14088271
Change-Id: Ia8157655e21adaf11b7ace90a98a9cca3c8a476c