OSDN Git Service
Colin Cross [Sat, 12 Jul 2014 01:09:04 +0000 (01:09 +0000)]
Merge "Revert "New SMS and MMS APIs and semantics (1/4)""
Colin Cross [Sat, 12 Jul 2014 01:06:38 +0000 (01:06 +0000)]
Revert "New SMS and MMS APIs and semantics (1/4)"
This reverts commit
f0dff59af4a1566d8d8bd997d059fcb9dddf2cb4.
Change-Id: I6b9206d80ae72fdb42d48b173927e63e5742f1b2
Lajos Molnar [Fri, 11 Jul 2014 02:59:18 +0000 (19:59 -0700)]
media: add crop rectangle to Image
Bug:
10706245
Change-Id: I9c9150bdef418fd96228addaa7c35f16e5e1ccff
Jungshik Jang [Fri, 11 Jul 2014 08:04:43 +0000 (17:04 +0900)]
Start system audio initialization mode on new device discovery.
If a new device is avr and current tv setting is system audio mode,
we should launch SystemAudioAutoInitiationAction.
Bug:
15843140
Change-Id: I8db89e9be21572e304e6eebb5948a7981df14e90
Jinsuk Kim [Fri, 11 Jul 2014 08:04:32 +0000 (17:04 +0900)]
Store active source/active port in HdmiControlService when disabled
This lets the service keep track of the latest change made by TV app
or TIF regarding active source/port.
Bug:
16222083
Change-Id: I0f1a4520eb3e52ca5024567b0f1fbe4fd59e8cbf
Jinsuk Kim [Fri, 11 Jul 2014 09:43:04 +0000 (18:43 +0900)]
Keep preferred address for HdmiControlService
Uses SystemProperties to store/retrieve preferred logical address
Bug:
15843075
Bug:
15844858
Change-Id: Ie1304805cbec4e11ef4b44a5cceb108121c60581
Ye Wen [Wed, 9 Jul 2014 23:51:49 +0000 (16:51 -0700)]
New SMS and MMS APIs and semantics (1/4)
API changes for SMS and MMS AIDLs
b/
14095333
Change-Id: I04f05c1952135cb4b5d422df060ca4054c14e5e5
Jeff Sharkey [Fri, 11 Jul 2014 23:40:37 +0000 (23:40 +0000)]
Merge "ITelphony.aidl: Rename hasCarrierPrivileges for packages to checkCarrierPrivilegesForPackage."
Shishir Agrawal [Fri, 11 Jul 2014 23:30:32 +0000 (16:30 -0700)]
ITelphony.aidl: Rename hasCarrierPrivileges for packages to checkCarrierPrivilegesForPackage.
Fixes the build breakage due to overloading in the aidl.
Change-Id: Id3199bf2d21b1834183c90904417ed016d34e052
Etan Cohen [Fri, 11 Jul 2014 18:54:14 +0000 (11:54 -0700)]
IMS: Add Config interface to get/set IMS service/capabilities
Change-Id: I5f422aae105cbf8e85aee711aaa49b5d2e958573
Adam Powell [Fri, 11 Jul 2014 22:37:15 +0000 (15:37 -0700)]
Add ViewGroup#getClipToPadding()
It's kind of silly that we've gone this long without a good way to
query this since it makes writing custom views that properly handle
EdgeEffects, etc. a real pain.
Change-Id: I08e1cdf9ec7b8ec3c287c22a5aa19d07a166a4e0
Alan Viverette [Fri, 11 Jul 2014 22:28:38 +0000 (15:28 -0700)]
Remove old listener when rebinding SwitchPreference
Also fixes switch animation during scrolling, unnecessary call to
requestLayout() on drawable invalidate, and potential NPE.
BUG:
16225972
BUG:
4312303
Change-Id: I015d1f03206dd2c812592b0abfa4214a3de73d3f
destradaa [Wed, 9 Jul 2014 17:46:39 +0000 (10:46 -0700)]
Add support in the platform for Activity Recognition Hardware.
Change-Id: I7c4fff3526583475a5edf1f4ba8fede4e9419ead
Yuncheol Heo [Fri, 11 Jul 2014 23:10:56 +0000 (23:10 +0000)]
Merge "Handle TODO in SystemAudioActionFromTv."
Yuncheol Heo [Fri, 11 Jul 2014 09:23:24 +0000 (18:23 +0900)]
Handle TODO in SystemAudioActionFromTv.
- Added onFinishedCallback to handle the deferred starting of FeatureAction.
Bug:
15843078, Bug:
15841546
Change-Id: I6cb5fba91d6115e8bb02c38601a72ed315c22e2f
Yuncheol Heo [Fri, 11 Jul 2014 07:06:40 +0000 (16:06 +0900)]
Handle <Feature Abort> after <System Audio Mode Request>.
- Fix some wrong return values.
Bug:
15841647
Change-Id: Ia4596e87204196b48429d55da4945f84de51a07b
Yohei Yukawa [Fri, 11 Jul 2014 10:59:07 +0000 (10:59 +0000)]
Merge "Add simple InputMethodSubtypeTest"
Yohei Yukawa [Fri, 11 Jul 2014 10:41:07 +0000 (19:41 +0900)]
Add simple InputMethodSubtypeTest
Change-Id: I87105c4935adfca249378e667161d2998cf77840
John Spurlock [Fri, 11 Jul 2014 22:56:26 +0000 (22:56 +0000)]
Merge "Volume: Extend the volume dialog timeout for notifications."
John Spurlock [Fri, 11 Jul 2014 22:51:32 +0000 (18:51 -0400)]
Volume: Extend the volume dialog timeout for notifications.
Even when the condition panel is collapsed, increase the timeout
a bit to aid readability.
Bug:
16237299
Change-Id: I36d01300a94f17e02ee35b5a6f549ed180532ad8
Yohei Yukawa [Fri, 11 Jul 2014 17:05:01 +0000 (17:05 +0000)]
Merge "Fix SDK build breakage"
Jean-Michel Trivi [Fri, 11 Jul 2014 17:01:00 +0000 (10:01 -0700)]
fix build: hide AudioAttributes.usageToString() method
Change-Id: I1041d9bf530df45878dd61e30e32f5a2f4f9d1a1
Yohei Yukawa [Fri, 11 Jul 2014 16:59:07 +0000 (01:59 +0900)]
Fix SDK build breakage
This should have been included in I3c6b69bd9d79b199afe68d838f25effa6
BUG:
15812658
BUG:
16118603
Change-Id: I298206008fc28faa4f6576a77d56251f873f233c
Svetoslav [Fri, 11 Jul 2014 16:45:07 +0000 (09:45 -0700)]
Addressing comments for the print preview feature.
Change-Id: Ib72140a912e22f859258d970e0d1c4ef06e807d5
Narayan Kamath [Fri, 11 Jul 2014 15:14:00 +0000 (16:14 +0100)]
Fix an abi <-> instructionSet mixup.
We should be calling is64BitInstructionSet and
not is64BitAbi.
Change-Id: I5b099af19f1d7409f65f63493d3f13a830f4fb5d
John Spurlock [Fri, 11 Jul 2014 02:51:18 +0000 (02:51 +0000)]
Merge "QS: Recenter feedback for non-dual tiles."
John Spurlock [Fri, 11 Jul 2014 02:49:16 +0000 (22:49 -0400)]
QS: Recenter feedback for non-dual tiles.
And dial the radius down a bit.
Bug:
15168179
Change-Id: I946c556b6c31a74a526368097c5c16a7ddbc9749
Jungshik Jang [Fri, 11 Jul 2014 02:15:31 +0000 (02:15 +0000)]
Merge "Revamp HDMI-CEC system audio mode integration with audio service."
Jungshik Jang [Tue, 8 Jul 2014 12:17:29 +0000 (21:17 +0900)]
Revamp HDMI-CEC system audio mode integration with audio service.
In previous change we use setForceUse(FORCE_MEDIA, XXX) method
in order to set specific audio output type, such as LINE, HDMI_ARC,
and SPDIF. But it turns out that it conflicts with bluetooth
a2dp which uses the same setForceUse(FORCE_MEDIA, yyy).
This change is based on several conditions.
1. When other non-speaker devices are on, prevent system audio
from turing on.
2. In order to keep track of other devices' connectivity and to
turn off system audio if other device like bluetooth or
headphone preempts current output, register OnAudioPortChangeListner
to audio manager.
3. All possible system audio outputs can be merged with other
outputs without priority.
Change-Id: Id4e47d99db64b9f77a17c2c28c47787ab8980bf7
Raph Levien [Thu, 10 Jul 2014 22:45:26 +0000 (15:45 -0700)]
Fix BCP47 language tags in fallback_fonts.xml
The BCP47 tag we use for selecting Simplified vs Traditional Chinese is
Hans and Hant. This patch uses those tags in fallback_fonts.xml rather
than country names, which weren't getting matched.
Change-Id: I97e1da7b86e8fe8f026365146393304a5ab74443
Jinsuk Kim [Fri, 11 Jul 2014 02:39:46 +0000 (02:39 +0000)]
Merge "Update HdmiControlService JNI to the change in HAL definition"
John Spurlock [Fri, 11 Jul 2014 02:20:46 +0000 (22:20 -0400)]
QS: Enable wifi entering detail (if disabled).
Bug:
16215297
Change-Id: I3cf2b7fadec0b10aeb894db5dc0b92d8b83511f7
Jinsuk Kim [Thu, 10 Jul 2014 22:26:45 +0000 (07:26 +0900)]
Update HdmiControlService JNI to the change in HAL definition
Change-Id: Iab235785c4d0242ab5845d1f8ad62d78770ff9c4
Tyler Gunn [Thu, 10 Jul 2014 21:34:51 +0000 (14:34 -0700)]
Adding call capabilities to indicate whether call supports VT.
Bug:
16213105
Change-Id: Icb05d3f0f6bd90b2c45bdfb7b199f38aaecc16ca
Amith Yamasani [Fri, 11 Jul 2014 16:35:32 +0000 (16:35 +0000)]
Merge "Fix apparent delay in removing a managed profile"
Amith Yamasani [Fri, 11 Jul 2014 15:40:19 +0000 (08:40 -0700)]
Fix apparent delay in removing a managed profile
Bug:
15268575
When returning the list of profiles, don't include dying users.
Change-Id: Ifeaed5c7c2b93922cddea22057dd890a1b3750fc
Narayan Kamath [Fri, 11 Jul 2014 10:50:24 +0000 (11:50 +0100)]
Allow 3 letter language codes in InputMethodUtils.
Replace locale.substring(0, 2) with a function that always
returns the first component of the locale (assumed to be the
language).
bug:
10090157
Change-Id: Ibb9eb9f65323795d139b16d76b7e7e36a4e0568c
Jorim Jaggi [Fri, 11 Jul 2014 00:12:03 +0000 (02:12 +0200)]
Fix weird state when tracking and pressing back
Bug:
10934514
Change-Id: I60bbd6005e664033ed22c87b404ddc918e5f2c0e
John Spurlock [Fri, 11 Jul 2014 15:10:03 +0000 (15:10 +0000)]
Merge "Volume: delay dismissing panel when starting settings."
John Spurlock [Fri, 11 Jul 2014 15:07:53 +0000 (11:07 -0400)]
Volume: delay dismissing panel when starting settings.
Bug:
16211952
Change-Id: I067721d932076dafb35c6afd99583301acff9bea
Junda Liu [Fri, 11 Jul 2014 22:55:21 +0000 (22:55 +0000)]
Merge "Add hidden systemapi hasCarrierPrivileges(pkgname)."
Svetoslav [Fri, 11 Jul 2014 22:52:57 +0000 (15:52 -0700)]
Adding back accidentally removed constants
Change-Id: Ib99000da8f31437e7d40eceb69779a0f4c2982e1
Junda Liu [Thu, 10 Jul 2014 22:19:03 +0000 (15:19 -0700)]
Add hidden systemapi hasCarrierPrivileges(pkgname).
Change-Id: I153f5c7cff1734c87587c3741051177ce54ba654
Sreeram Ramachandran [Fri, 11 Jul 2014 22:53:22 +0000 (22:53 +0000)]
Merge "Delete unused APIs in NetworkManagementService."
Svetoslav [Fri, 11 Jul 2014 22:47:32 +0000 (15:47 -0700)]
Remove commented out dead code
Change-Id: I3e59d0ee55fd864ea0d8bc5f99cdb74d9b0e49bb
Fabrice Di Meglio [Fri, 11 Jul 2014 02:33:33 +0000 (19:33 -0700)]
Fix TimePicker behavior
- use Alert Theme and make the TimePickerDialog show its done button
in the legacy mode
- if targetSdkVersion < L or if TV UI show the legacy TimePicker
Change-Id: I19ca6dbbcb50599c7e230262a23956c185f53a5c
Sreeram Ramachandran [Fri, 11 Jul 2014 22:47:13 +0000 (15:47 -0700)]
Delete unused APIs in NetworkManagementService.
Change-Id: Idc6c0ac0d3a4149821fc7820b7f37d4209fc55d3
Lajos Molnar [Mon, 7 Jul 2014 18:32:08 +0000 (11:32 -0700)]
MediaCodec: update documentation on buffer metadata.
- Deprecated BUFFER_FLAG_SYNC_FRAME (as it actually marks key
frames).
- Clarified that BUFFER_FLAG_KEY_FRAME is used for encoded output
buffers.
- Clarified that presentationTimeUs is not an actual render
timestamp (as opposed to releaseOutputBuffer's render timestamp).
Bug:
12006531
Change-Id: Ia27b9f606a9d7eef9c0c2900cd864a4421c7cf31
Svetoslav [Fri, 11 Jul 2014 22:19:22 +0000 (15:19 -0700)]
Fix print preview rendered page preloading.
After the preview list is scrolled we are preloading the
pages around the ones that are shown, so now if the user
does a slight adjustment (expected after a scroll) the
pages around are rendered. There was an off by one error
and one of the bitmaps of the shown pages was reused and
as a result the wrong content was shown.
Change-Id: If04aebf46bcc637491221c6218005ecc1a7253d2
Svetoslav [Fri, 11 Jul 2014 21:39:43 +0000 (14:39 -0700)]
Fix the print button appearance.
Change-Id: Ie19a52eaf08e1e39bb488c5afa2344c72e646b0b
Deepanshu Gupta [Thu, 10 Jul 2014 23:16:29 +0000 (16:16 -0700)]
Style improvements to LayoutLib create.
This change doesn't change the functionality but removes dead code and
simplifies various places to remove warnings.
Change-Id: I371e06bfbd587dbf0eeafc69787b9805f7008f62
Deepanshu Gupta [Thu, 10 Jul 2014 20:57:52 +0000 (13:57 -0700)]
Update delegates
Change-Id: Icd93c31b4e8c8ee5ea242fb8295578937f48ff2a
Vinit Deshpande [Fri, 11 Jul 2014 21:36:52 +0000 (21:36 +0000)]
Merge "Unhide WifiAdapter APIs"
Craig Mautner [Wed, 9 Jul 2014 12:44:55 +0000 (05:44 -0700)]
Add task affiliation
Introduces new flag Intent.FLAG_ACTIVITY_LAUNCH_BEHIND which
causes the newly launched task to affiliate with the launching task.
(Later this flag will also launch the task behind the current task).
This shows up in a new member of the RecentTaskInfo class. This also
causes the recents list returned by getRecentsInfo to be rearranged
so that affiliated tasks are together.
Fixes bug
16157517.
Change-Id: Ia1386af50da2f01809278b62d249f05c6a0de951
Vinit Deshpande [Fri, 11 Jul 2014 19:48:04 +0000 (12:48 -0700)]
Unhide WifiAdapter APIs
Change-Id: Ia19ab4cfddddd3285ae9e0c5804f2cceda4cf063
Igor Murashkin [Fri, 11 Jul 2014 21:09:53 +0000 (21:09 +0000)]
Merge "camera2: (LEGACY) Update flash modes to fix #testFlashControl CTS"
Igor Murashkin [Fri, 11 Jul 2014 01:08:47 +0000 (18:08 -0700)]
camera2: (LEGACY) Update flash modes to fix #testFlashControl CTS
Change-Id: I9b66a2b4393f4bc2272ecc94cd9a5c6273f3de59
Igor Murashkin [Thu, 10 Jul 2014 23:46:07 +0000 (16:46 -0700)]
camera2: (legacy) Fixes for CaptureRequestTest#testAeModeAndLock
Change-Id: I5c1008cf34a9d98f67c36966e7cbf1c312979f97
Igor Murashkin [Thu, 10 Jul 2014 00:20:23 +0000 (17:20 -0700)]
camera2: (Legacy) Implement ae compensation step ranges and ae/awb locks
Characteristics:
* control.aeCompensationRange
* control.aeCompensationStep
Request/Result:
* control.aeExposureCompensation
* control.aeLock
* control.awbLock
Change-Id: I911616c9cf3e0e9a03a0cb383bcf232cab8ca772
Igor Murashkin [Wed, 9 Jul 2014 21:21:29 +0000 (14:21 -0700)]
camera2: (legacy) Implement AF/AE regions for request and result
* Also stop lying about max AE regions (now reports the truth)
Change-Id: I567a1e6c58ed0bfb77cc09787393ea18eba5d613
Tim Murray [Fri, 11 Jul 2014 22:38:32 +0000 (22:38 +0000)]
Merge "Fix broken blend intrinsic."
Barnaby James [Fri, 11 Jul 2014 18:36:53 +0000 (18:36 +0000)]
Merge "Add VoiceInteraction request type for successful actions."
Barnaby James [Mon, 7 Jul 2014 17:51:06 +0000 (10:51 -0700)]
Add VoiceInteraction request type for successful actions.
Add CompleteVoiceRequest to VoiceInteractor to allow apps to indicate when a voice interaction was successfully completed.
Change-Id: I1481cfe96e9e2495d88a7a4fb62263bdd1e03c54
John Spurlock [Fri, 11 Jul 2014 18:36:20 +0000 (18:36 +0000)]
Merge "Zen: Be more defensive against old time conditions."
John Spurlock [Fri, 11 Jul 2014 18:33:18 +0000 (14:33 -0400)]
Zen: Be more defensive against old time conditions.
Bug:
16192570
Change-Id: If5097174fac89c5d809271241645d1efca92476e
Alan Viverette [Thu, 10 Jul 2014 22:55:35 +0000 (22:55 +0000)]
Merge "Remove material progress drawable"
Alan Viverette [Thu, 10 Jul 2014 22:48:37 +0000 (15:48 -0700)]
Remove material progress drawable
BUG:
16138805
Change-Id: If8a8981e6ce741d563e870e3c09cbb5f39d30ac9
Sreeram Ramachandran [Thu, 10 Jul 2014 21:44:56 +0000 (21:44 +0000)]
Merge "Allow a VPN to be declared bypassable."
Sreeram Ramachandran [Thu, 10 Jul 2014 04:43:03 +0000 (21:43 -0700)]
Allow a VPN to be declared bypassable.
A VPN declared bypassable allows apps to use the new multinetwork APIs to
send/receive traffic directly over the underlying network, whereas without it,
traffic from those apps would be forced to go via the VPN.
Apps still need the right permissions to access the underlying network. For
example, if the underlying network is "untrusted", only apps with
CHANGE_NETWORK_STATE (or such permission) can actually use it directly.
New API with stub implementation to be filled out later.
Bug:
15347374
Change-Id: I8794715e024e08380a43f7a090613c5897611c5b
Christoph Studer [Thu, 12 Jun 2014 13:25:59 +0000 (15:25 +0200)]
NotificationListenerService API: Avoid unnecessary allocations
Instead of producing Ranking objects, RankingMap just populates
them now, allowing developers to re-use objects and avoid
unnecessary allocations.
Also rename isInterceptedByDnd() to meetsInterruptionFilter(),
since DND is not a concept anymore.
Bug:
15415840
Bug:
16099064
Change-Id: If9861cbdf14593e641a4d4ffd1b967647eb8e2b8
destradaa [Thu, 10 Jul 2014 21:36:43 +0000 (21:36 +0000)]
Merge "Mark FLP constants as public, so they can be consumed by geofencing."
Sreeram Ramachandran [Thu, 10 Jul 2014 04:11:12 +0000 (21:11 -0700)]
Let VpnService specify a white/black list of apps that are allowed access.
New API with stub implementation to be filled out later.
Bug:
13651397
Change-Id: Ibabd6c22495ce58dc88142bb958c1ef12adcf78e
Jorim Jaggi [Thu, 10 Jul 2014 21:07:00 +0000 (23:07 +0200)]
Implement two-finger pull down to QS.
Bug:
14590707
Change-Id: I7f88a5b26e88c79e19d4e6c7f4cc8277ffcb2d57
Jean-Michel Trivi [Fri, 11 Jul 2014 16:33:09 +0000 (16:33 +0000)]
Merge "Define audio policy, mixes, and mixing rules"
Jean-Michel Trivi [Tue, 1 Jul 2014 16:48:46 +0000 (09:48 -0700)]
Define audio policy, mixes, and mixing rules
An AudioMixingRule is a collection of AudioAttributes and match/exclude
rules.
An AudioMix is defined by its AudioMixingRule, AudioFormat and
routing flag.
An AudioPolicyConfig is a collection of AudioMix and is
parcellable.
An AudioPolicy has an AudioPolicyConfig, and
can be registered/unregistered through AudioManager.
bug
16009464
Change-Id: I01bf95d014967f48ba823648ea897779da099e5d
Yohei Yukawa [Fri, 11 Jul 2014 16:20:06 +0000 (16:20 +0000)]
Merge "Use a bit more descriptive name for a parameter"
Yohei Yukawa [Fri, 11 Jul 2014 16:11:45 +0000 (01:11 +0900)]
Use a bit more descriptive name for a parameter
The current parameter name "index" in
CursorAnchorInfo.Builder#setComposingText is a bit hard
to understand.
This CL names it with "composingTextStart" to clarify its usage.
Change-Id: I504939b8d2b48875d8baa9630b5a4f04a5d66dbe
Paul Jensen [Fri, 11 Jul 2014 16:15:08 +0000 (16:15 +0000)]
Merge "Define NETID_UNSET in ConnectivityManager."
Paul Jensen [Fri, 11 Jul 2014 12:17:29 +0000 (08:17 -0400)]
Define NETID_UNSET in ConnectivityManager.
This allows some cleanup and removal of dead code.
bug:
15489928
Change-Id: Iaf0507bc2e8ec6dcc253f01f61c5b221d46581f9
dcashman [Sat, 12 Jul 2014 00:22:11 +0000 (00:22 +0000)]
Merge "Remove KeySetManagerService lock."
dcashman [Fri, 20 Jun 2014 22:53:06 +0000 (15:53 -0700)]
Remove KeySetManagerService lock.
The KeySetManagerService is a part of the PackageManagerService, which is
responsible for maintaining the association between packages, keysets and
public keys. This information is a critical component of the
PackageManagerService data, and should require the holding of the
PackageManagerService's lock. Remove the existing KeySetManagerService lock
and require the mPackages lock to be held instead.
Bug:
6967056
Change-Id: I803f8388e42469d30562b40212cf497320851268
Jeff Sharkey [Sat, 12 Jul 2014 00:02:23 +0000 (00:02 +0000)]
Merge "Progress toward installer public API: callbacks."
Jeff Sharkey [Thu, 10 Jul 2014 19:10:25 +0000 (12:10 -0700)]
Progress toward installer public API: callbacks.
Instead of surfacing all the existing cryptic error codes, we're
going to classify them into broad categories when surfacing through
public API. This change introduces InstallResultCallback and
UninstallResultCallback, and wires them up to existing AIDL
interfaces.
Also start defining general SessionObserver for apps interested
in general progress details, such as Launcher apps. Details about
active sessions are returned through new InstallSessionInfo objects.
Bug:
14975160
Change-Id: I068e2b0c30135f6340f59ae0fff93c321047f8f9
Chet Haase [Fri, 11 Jul 2014 20:57:49 +0000 (20:57 +0000)]
Merge "Optimize gatherTransparentRegions to account for transparent bg"
Chet Haase [Fri, 11 Jul 2014 20:38:51 +0000 (13:38 -0700)]
Optimize gatherTransparentRegions to account for transparent bg
gatherTransparentRegions() incorrectly takes the background into account
even when that background drawable is a completely transparent ColorDrawable
(which you can get by calling View.setBackgroundColor(0)). Checking
the opacity of the drawable allows us to ignore drawables that are not
visible.
Issue #
13465427 Performance suggestion: View.setBackgroundColor(0) should set background to null
Change-Id: Ic552bf6a07cc9229fd32febc3ada73a0701cad0c
Igor Murashkin [Fri, 11 Jul 2014 20:47:08 +0000 (20:47 +0000)]
Merge changes I5c1008cf,I911616c9
* changes:
camera2: (legacy) Fixes for CaptureRequestTest#testAeModeAndLock
camera2: (Legacy) Implement ae compensation step ranges and ae/awb locks
Igor Murashkin [Fri, 11 Jul 2014 20:46:30 +0000 (20:46 +0000)]
Merge "camera2: (legacy) Implement AF/AE regions for request and result"
Jorim Jaggi [Fri, 11 Jul 2014 19:42:00 +0000 (21:42 +0200)]
Split AM/PM from the rest of the time in expanded QS
This allows us to scale AM/PM independently of the rest of the time
string to allow for a different scale when QS is expanded.
Bug:
16177564
Change-Id: I472db549c875f6975583a6a426cb1ebc2fc37ac3
Adam Powell [Fri, 11 Jul 2014 20:40:06 +0000 (20:40 +0000)]
Merge "Block focus with a touchscreen for ActionBars and Toolbars"
Aaron Whyte [Fri, 11 Jul 2014 20:34:41 +0000 (13:34 -0700)]
resolved conflicts for merge of
d2b5f7da to master
Change-Id: I8ec28728c12d7cc3ce2c4f3d09d9ce6162504618
Adam Powell [Fri, 11 Jul 2014 20:06:40 +0000 (13:06 -0700)]
Block focus with a touchscreen for ActionBars and Toolbars
Focus in the presence of a keyboard follows content, not navigational
elements.
Change-Id: I08d0f2fcfe0d4c58418466545b7b57d1345bd07f
Andrew Solovay [Fri, 11 Jul 2014 20:23:06 +0000 (20:23 +0000)]
am
245c4f61: am
6462615c: Merge "docs: Changed screenshot to use layout name" into klp-modular-dev
* commit '
245c4f6158b0f72f893cac7bbc1a18a9887be896':
docs: Changed screenshot to use layout name
destradaa [Fri, 11 Jul 2014 19:38:41 +0000 (19:38 +0000)]
Merge "Update location framework to accept raw data from GPS HAL."
Alan Viverette [Fri, 11 Jul 2014 19:34:06 +0000 (12:34 -0700)]
Remove old RippleDrawable constructor, fix new constructor
BUG:
16221737
Change-Id: I3807d8d7ccccf66568b9d5421cb9456fe818e2bf
destradaa [Tue, 24 Jun 2014 01:19:03 +0000 (18:19 -0700)]
Update location framework to accept raw data from GPS HAL.
Change-Id: Ib4feca004b53fa89dcece4299974ab08913455a0
Aaron Whyte [Fri, 11 Jul 2014 01:46:08 +0000 (01:46 +0000)]
am
f5e67474: Allow overlays to configure ConnectivityService\'s network sampling to not wake the device. This can increase clockwork device battery life. Bug:
15455204
* commit '
f5e6747440cc0d29c663a792e32d9618f842ecf2':
Allow overlays to configure ConnectivityService's network sampling to not wake the device. This can increase clockwork device battery life. Bug:
15455204
Andrew Solovay [Fri, 11 Jul 2014 01:46:03 +0000 (01:46 +0000)]
am
6462615c: Merge "docs: Changed screenshot to use layout name" into klp-modular-dev
* commit '
6462615c3913b74e14e356cf449115a012c39526':
docs: Changed screenshot to use layout name
Jason Sams [Thu, 17 Apr 2014 20:52:26 +0000 (13:52 -0700)]
Unhide RenderScript resize intrinsic
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
Emily Bernier [Fri, 11 Jul 2014 18:48:11 +0000 (18:48 +0000)]
Merge "Prevent users from mounting USB, if restricted."
Chong Zhang [Fri, 11 Jul 2014 19:16:51 +0000 (19:16 +0000)]
Merge "MediaCodec async callbacks"