OSDN Git Service
Anish Athalye [Mon, 28 Jul 2014 19:16:04 +0000 (19:16 +0000)]
am
c51a6e45: (-s ours) am
a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views
* commit '
c51a6e45e857ee42d122e898590eb815e568564d':
DO NOT MERGE Fix line breaking for clusters in narrow views
Jorim Jaggi [Mon, 28 Jul 2014 15:43:56 +0000 (17:43 +0200)]
Clear all notifications improvements
- Fix a bug with visibility.
- Improve fling behavior such that the shade open animation still
looks like that we are decelerating towards the last card.
Change-Id: I1ad167ce0001ff6850f49e819bab944943fa529d
Anish Athalye [Mon, 28 Jul 2014 19:10:19 +0000 (19:10 +0000)]
am
a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views
* commit '
a28e4764994283c3595dd41f12e425cf7dc0d985':
DO NOT MERGE Fix line breaking for clusters in narrow views
Anish Athalye [Fri, 27 Jun 2014 21:37:53 +0000 (14:37 -0700)]
DO NOT MERGE Fix line breaking for clusters in narrow views
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.
Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit
162713dd0b72af79c1b2286985f7e79f043cd915)
Craig Mautner [Fri, 25 Jul 2014 02:19:53 +0000 (02:19 +0000)]
am
a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit '
a0bb44efe96ca70635b64dac8922b225d1a19407':
Finish crashed activities immediately
Robert Greenwalt [Mon, 28 Jul 2014 19:07:14 +0000 (19:07 +0000)]
Merge "Remove dead code 1." into lmp-dev
Sreeram Ramachandran [Sun, 27 Jul 2014 07:37:35 +0000 (00:37 -0700)]
Prohibit address families by default unless a VPN explicitly allows them.
Bug:
15972465
Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
Zhijun He [Fri, 25 Jul 2014 16:06:11 +0000 (09:06 -0700)]
ImageFormat: update raw10 spec to allow row padding
Change-Id: Id191b92037487f16538d111fc6171d3be9a02acf
Robert Greenwalt [Sun, 27 Jul 2014 17:56:49 +0000 (10:56 -0700)]
Remove dead code 1.
Starting with startUsingNetworkFeature and stop.
Figure it's easier to code review incremental changes.
Change-Id: I19aee65e740858c3a9a2a1a785663f6fee094334
Sandeep Siddhartha [Sat, 26 Jul 2014 01:37:29 +0000 (18:37 -0700)]
Use blob (shared memory) for large data in sound model/recognition event/config
Also add a missing null check in writeBlob
Bug:
16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
RoboErik [Mon, 28 Jul 2014 18:07:04 +0000 (18:07 +0000)]
Merge changes I87f551a7,Icb8dc76c,I66fbf585,I0c9506e7 into lmp-dev
* changes:
Add context to MediaController constructor
Add getPackageName to MediaController
Expose a way to set a PendingIntent for restarting playback
Finish plumbing for launch intents in sessions
RoboErik [Fri, 25 Jul 2014 23:00:52 +0000 (16:00 -0700)]
Add context to MediaController constructor
This also adds a convenience method to MediaSession to allow getting
a controller instead of having to create and cache your own.
bug:
16561220
Change-Id: I87f551a7474e71f1cf2f07e0e541c3a4515cd977
RoboErik [Fri, 25 Jul 2014 01:35:11 +0000 (18:35 -0700)]
Add getPackageName to MediaController
This removes the MediaSessionInfo class and adds a method on the
controller to get the package name. This also converts code that
depended on the session's UUID to use the token for comparison or
the Tag in the case of test code that needs a string identifier.
Change-Id: Icb8dc76c70e23e897da8fd07651c524b96372bf9
RoboErik [Thu, 24 Jul 2014 20:20:30 +0000 (13:20 -0700)]
Expose a way to set a PendingIntent for restarting playback
This is to allow apps to set a PendingIntent to restart playback. This
is not persisted across reboots but will allow music to start playing
again for the life of the system. Only the most recent priority app with
a PI set will be cached. This also deprecates methods in AudioManager
that do this and unhides the unregister method in MediaSessionManager.
Change-Id: I66fbf5856333468d8cb8a3022809778ba00d426e
RoboErik [Thu, 24 Jul 2014 17:20:41 +0000 (10:20 -0700)]
Finish plumbing for launch intents in sessions
This finishes out the plumbing for setting a launchable PendingIntent
on a session and getting it from a controller to launch an app's UI.
Change-Id: I0c9506e7c3f0ebf57070ca7e0d91324eb3fdd1e1
RoboErik [Wed, 23 Jul 2014 21:53:30 +0000 (14:53 -0700)]
Add getFlags and getSessionToken to MediaController
getFlags was hidden, should have been public. Also added getSessionToken
as a convenience method for apps to get the token used to create a
controller.
bug:
15408392
Change-Id: Icb19b43ebb7e01727eec1a4e667dafcfc3b8d4eb
Ji-Hwan Lee [Fri, 25 Jul 2014 11:20:38 +0000 (20:20 +0900)]
TIF: Rename ComponentName variables to "component" consistently
Currently, it's sometimes "name", or "service".
Change-Id: I91dffe30fd2b873c744dbde2c027f0582f55746f
Craig Mautner [Fri, 25 Jul 2014 01:30:51 +0000 (01:30 +0000)]
Merge "Finish crashed activities immediately" into klp-modular-dev
RoboErik [Mon, 28 Jul 2014 18:06:45 +0000 (18:06 +0000)]
Merge "Add getFlags and getSessionToken to MediaController" into lmp-dev
Andrew Lee [Fri, 25 Jul 2014 16:41:56 +0000 (09:41 -0700)]
Move VideoCallProvider into ConnectionService.
Bug:
16494880
Change-Id: I0778197d06fcd219db4a1e1fa065e69026254a99
Vinit Deshpande [Mon, 28 Jul 2014 17:35:12 +0000 (17:35 +0000)]
Merge "Enable RTT End-to-end" into lmp-dev
Vinit Deshpande [Sat, 26 Jul 2014 00:46:14 +0000 (17:46 -0700)]
Enable RTT End-to-end
This change includes various fixes to first RTT implementation and
enables RTT APIs end-to-end. Fixes include proper marshalling of
objects across API and service and JNI fixes.
Change-Id: Ie4ba1ffc6c5b42593e931438b3f03e201ff6be71
Andre Eisenbach [Fri, 25 Jul 2014 22:16:11 +0000 (15:16 -0700)]
LE: Do not invoke callback if retrying read/write operation
When a descriptor read/write operation fails with insufficient
authentication/encryption, it will automatically be tried again with
elevated security requirements. The first (failed) attempt should not be
reported to the application requesting the read/write, since it will get
the 2nd callback once the retry succeeds/fails.
Change-Id: Ia27b91afa63b6f9ffdc597d59c24d29f3d8a1008
John Spurlock [Mon, 28 Jul 2014 15:17:12 +0000 (11:17 -0400)]
QS: Allow hotspot tile on secure keyguard.
Bug:
16234190
Change-Id: I82a724e46f0a6ddd5c719742ef9c4f86feb791dc
Adrian Roos [Mon, 28 Jul 2014 13:58:50 +0000 (15:58 +0200)]
Update KeyguardStatusView on user and alarm changes
Refreshes both owner info and the next alarm when
the current user changes. Also updates the next
alarm when it changes.
Bug:
16531212
Change-Id: Ibc9de5d28b2cafd6946fc56602f12769d3526728
Jean-Michel Trivi [Mon, 28 Jul 2014 17:32:38 +0000 (17:32 +0000)]
Merge "AudioTrack transfer mode in JNI" into lmp-dev
Alexandra Gherghina [Fri, 25 Jul 2014 19:03:47 +0000 (20:03 +0100)]
Return a default icon from the package manager directly
Bug:
16369104
Change-Id: I2db300a69a08030eacc245ee91556f0443ba5878
Jean-Michel Trivi [Mon, 28 Jul 2014 16:52:14 +0000 (09:52 -0700)]
AudioTrack transfer mode in JNI
Set the correct transfer mode in AudioTrack JNI and configuring
the native AudioTrack instance, based on the memory mode
passed in Java.
Add comment about the audio attributes parameter superseeding
the stream type parameter in the AudioTrack constructor.
Change-Id: Ia43f42874452ac47c3c044d5446a4732da0fd56c
Lorenzo Colitti [Thu, 17 Jul 2014 16:34:19 +0000 (01:34 +0900)]
Add a getBoundURL method that returns a network-specific URL.
Change-Id: I4b57e675bb87064ab75dcc36b00fdc7a2987b86e
John Reck [Mon, 28 Jul 2014 16:48:15 +0000 (16:48 +0000)]
Merge "Avoid calling non-final methods in ctor" into lmp-dev
John Reck [Mon, 28 Jul 2014 16:30:36 +0000 (09:30 -0700)]
Avoid calling non-final methods in ctor
Bug:
16239227
Avoid potential issues in views that override invalidate() but
are not prepared to have overridden methods called prior to their
ctor
Change-Id: Ic2574bdfea454451d6881c7e27a6474dc4dbc07c
John Reck [Mon, 28 Jul 2014 16:48:12 +0000 (16:48 +0000)]
Merge "Throw IAE on invalid scale" into lmp-dev
John Reck [Mon, 28 Jul 2014 16:19:19 +0000 (09:19 -0700)]
Throw IAE on invalid scale
Bug:
16565964
Change-Id: I0cc35c532b42433381e1ae7f350c95ecbb4d09c3
Craig Mautner [Thu, 24 Jul 2014 20:32:37 +0000 (13:32 -0700)]
Finish crashed activities immediately
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.
Fixes bug
15092354.
Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
Prashant Malani [Thu, 24 Jul 2014 18:06:03 +0000 (18:06 +0000)]
am
b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit '
b4dcc64fe6314b139ac17aa296419bbf153df2f6':
Revert "Remove circular mask"
Jinsuk Kim [Fri, 25 Jul 2014 23:15:02 +0000 (23:15 +0000)]
Merge "MHL controller for subcommand reception" into lmp-dev
Jinsuk Kim [Thu, 24 Jul 2014 05:48:34 +0000 (14:48 +0900)]
MHL controller for subcommand reception
Implement HdmiMhlController command reception part.
Bug:
16215362
Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
Dake Gu [Fri, 25 Jul 2014 22:36:23 +0000 (15:36 -0700)]
fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
b/
16575308
Change-Id: Ieb4f15a8ead7da9682c97d4d342cd77e0b85e5f8
Michael Wright [Fri, 25 Jul 2014 21:05:42 +0000 (14:05 -0700)]
Add missing documentation for createVirtualDisplay
Fix incorrect access modifier in Activity documentation.
Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
Ruben Brunk [Fri, 25 Jul 2014 22:12:33 +0000 (15:12 -0700)]
camera2: Update preview counter after request completed.
Bug:
15116722
- This was causing the preview counter to double decrement
for requests where the jpeg callback was executed first.
Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
Winson Chung [Fri, 25 Jul 2014 22:46:57 +0000 (15:46 -0700)]
Fixing issue with Recents not triggering correctly for secondary users. (Bug
15689540)
Julia Reynolds [Mon, 28 Jul 2014 14:03:41 +0000 (14:03 +0000)]
Merge "Remove the profile/device owner user restriction bypass." into lmp-dev
Julia Reynolds [Thu, 24 Jul 2014 22:21:29 +0000 (18:21 -0400)]
Remove the profile/device owner user restriction bypass.
Bug:
16566096
Change-Id: I4a56046df44d36d82edc64fc727e8cad5dc75382
Jeff Brown [Sat, 26 Jul 2014 02:34:00 +0000 (02:34 +0000)]
Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
Jeff Brown [Sat, 26 Jul 2014 02:30:05 +0000 (19:30 -0700)]
Fix a deadlock due to AMS calling into WMS with its lock held.
The full deadlock cycle involved ActivityManagerService,
WindowManagerService, and DevicePolicyManagerService.
Fixed by posting the work of enabling the screen to the handler
instead of doing it immediately while holding the activity manager
lock.
Bug:
16578860
Change-Id: I10514cd2df993c7193747ae823e1990a2c34e196
Jeff Brown [Sat, 26 Jul 2014 02:03:28 +0000 (19:03 -0700)]
Don't suppress haptic feedback on keyguard anymore.
This enables haptic feedback from virtual keys, lift-to-wake,
and long-press power to work as expected on the keyguard.
There doesn't seem to be a good reason for us to block haptic feedback
on keyguard anymore. The PIN, pattern, and password locks already
bypass this check and vibrate and require a swipe to access in
the first place. So there doesn't seem to be much potential
for accidental vibration anymore.
If this becomes a problem then we can investigate more targeted
means to suppress undesired vibration.
Added some debugging code to VibratorService.
Bug:
16535403
Change-Id: Ia7a5d8c35244009db36c358e5cbcbf8cf5d68768
Sandeep Siddhartha [Fri, 25 Jul 2014 23:19:42 +0000 (16:19 -0700)]
Add read/writeBlob to Parcel
These are {@hide}en for now.
Bug:
16516353
Change-Id: Ie1635617ee8611a78be9068a7ce674e34c30301d
Jay Civelli [Fri, 25 Jul 2014 23:35:59 +0000 (23:35 +0000)]
Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
Breaks the JavaDoc generation.
This reverts commit
c82a11573810ed4d1f40568d19afc27f726829af.
Change-Id: I9e38a0d6ba0935d4967b50023030c99727bfc839
ztenghui [Fri, 25 Jul 2014 23:30:18 +0000 (23:30 +0000)]
Merge "API REVIEW: VectorDrawable" into lmp-dev
Jorim Jaggi [Fri, 25 Jul 2014 23:24:52 +0000 (01:24 +0200)]
Add possible string to survive string freeze.
Winter is coming!
Change-Id: I806e8ece14895f9d79127dd7f98b6818d72ecbf1
ztenghui [Wed, 23 Jul 2014 16:47:50 +0000 (09:47 -0700)]
API REVIEW: VectorDrawable
- Merge <size> and <viewport> attributes all in to top-level <vector> tag
- Indent attributes under <group> in java doc.
- Updata android:stroke to be android:strokeColor, likewise android:fill
- Instead of android:clipToPath, make this a different clip-path tag.
- Document units of the various attributes
- Add example code for defining a VectorDrawable resource
More than that:
= Refactor the code to better support clipPath as a sub-class.
= Update all the xml files to use the new attributes and clip-path tag.
TODO:
-- Remove clipToPath, since that should happen on build break Friday.
bug:
16488254
Change-Id: I6db5680ef83cb26c8f064a60fc7d6e7142974b0f
Evan Charlton [Fri, 25 Jul 2014 22:46:29 +0000 (22:46 +0000)]
Merge "Make creating the Connection synchronous" into lmp-dev
Evan Charlton [Mon, 21 Jul 2014 05:06:28 +0000 (22:06 -0700)]
Make creating the Connection synchronous
Get rid of CreateConnectionResponse and have the ConnectionService
return the built connection instead.
Change-Id: Ibbf896e5b188b98eb386d6624d3a5d5cacf49922
Jon Miranda [Fri, 25 Jul 2014 17:35:14 +0000 (10:35 -0700)]
Fixes the build.
Change-Id: I4d0f04c480ff787e5f0310fd92a3734180154a9a
Lajos Molnar [Sat, 26 Jul 2014 02:33:46 +0000 (02:33 +0000)]
Merge "Implement MediaCodec.getImage methods" into lmp-dev
Lajos Molnar [Fri, 25 Jul 2014 14:51:02 +0000 (07:51 -0700)]
Implement MediaCodec.getImage methods
Bug:
10706245
Change-Id: Icbac5538a27ffdb53d974e2e1f8dc5afe02fb391
Ji-Hwan Lee [Fri, 25 Jul 2014 11:39:05 +0000 (20:39 +0900)]
TIF: Fix invalid use of serviceStateMap.get()
Change-Id: Ic43ac2697ed459a105e62c81e8cb6d0fb8ff6dd0
Amith Yamasani [Fri, 25 Jul 2014 19:26:53 +0000 (12:26 -0700)]
Hidden global setting to allow adding users from lockscreen
This will be undefined/off by default. User has to explicitly
turn it on in the Settings->Users->menu.
Bug:
15760168
Change-Id: I204f28cee2b04832c42e8ec5ced960f6916bfe5a
Alan Viverette [Sat, 26 Jul 2014 00:58:31 +0000 (00:58 +0000)]
Merge "Add public attribute for window clipToOutline" into lmp-dev
Alan Viverette [Sat, 26 Jul 2014 00:48:55 +0000 (17:48 -0700)]
Add public attribute for window clipToOutline
Also ensures clipToOutline is false is the background is null.
BUG:
16549166
BUG:
16566746
Change-Id: Iacb08b64464cb93cbd8f34f2ec0308a77d40aab5
Andrew Lee [Fri, 25 Jul 2014 16:03:49 +0000 (16:03 +0000)]
Merge "Add VideoCall and VideoCall.Listener as an inner classes of Call." into lmp-dev
Kenny Guy [Wed, 23 Jul 2014 11:23:35 +0000 (12:23 +0100)]
Add method to launch settings app details page.
Add a method to LauncherApps to allow launchers to
show application details for an app in a managed profile.
Bug:
16371359
Change-Id: I23acb4365c09e4a7b9fa742ae6fc7e04434f45aa
Andrew Lee [Tue, 22 Jul 2014 23:41:54 +0000 (16:41 -0700)]
Add VideoCall and VideoCall.Listener as an inner classes of Call.
Bug:
16494880
Bug:
16495203
Change-Id: Ife3b6723374ea5fbbff4927c4f9168d075be21e1
Derek Sollenberger [Thu, 24 Jul 2014 19:22:13 +0000 (15:22 -0400)]
Move Canvas.h to a new location so that it can be shared with HWUI.
Bug:
15672762
Change-Id: Ia59e986cd4034e16b2e54e8d594e6941a6c9fb1b
Jeff Brown [Sat, 26 Jul 2014 02:33:28 +0000 (02:33 +0000)]
Merge "Don't suppress haptic feedback on keyguard anymore." into lmp-dev
Sreeram Ramachandran [Fri, 25 Jul 2014 22:44:48 +0000 (22:44 +0000)]
Merge "Implement support for bypassable VPNs." into lmp-dev
Fabrice Di Meglio [Fri, 25 Jul 2014 22:26:18 +0000 (15:26 -0700)]
Fix bug #
16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
- simply create a method for passing those parameters
- remove non needed constants
Change-Id: If6e7d21ff07370edd8c73d1e9b5c5f820f3deb5d
Sreeram Ramachandran [Wed, 23 Jul 2014 22:23:15 +0000 (15:23 -0700)]
Implement support for bypassable VPNs.
Bypassable VPNs grab all traffic by default (just like secure VPNs), but:
+ They allow all apps to choose other networks using the multinetwork APIs.
If these other networks are insecure ("untrusted"), they will enforce that the
app holds the necessary permissions, such as CHANGE_NETWORK_STATE.
+ They support consistent routing. If an app has an existing connection over
some other network when the bypassable VPN comes up, it's not interrupted.
Bug:
15347374
Change-Id: Iaee9c6f6fa8103215738570d2b65d3fcf10343f3
Winson Chung [Fri, 25 Jul 2014 21:58:01 +0000 (14:58 -0700)]
Announcing when a task is dismissed (for accessibility). (Bug
9181212)
John Reck [Fri, 25 Jul 2014 22:22:52 +0000 (22:22 +0000)]
Merge "Shut up" into lmp-dev
John Reck [Fri, 25 Jul 2014 22:19:38 +0000 (15:19 -0700)]
Shut up
Change-Id: I7edbedf665a567e363e3db7984c7c59cba857ad5
Dake Gu [Fri, 25 Jul 2014 21:00:17 +0000 (14:00 -0700)]
ExitTransitionCoordinator: suppressLayout during running transition
b/
16570734
Change-Id: I52d7132b91256085aa9e535575e978a6031fb276
Chris Craik [Fri, 25 Jul 2014 18:25:02 +0000 (18:25 +0000)]
Revert "Dump RenderThread stack on unresponsive"
bug:
16563871
bug:
16565900
bug:
16555847
bug:
16551643
This reverts commit
ca66e06b9db6e6c921662886e4b7ddd02ac92280.
Change-Id: I23e8d4eaf828b1b298126ba5f36e4e8e7451706a
John Spurlock [Fri, 25 Jul 2014 22:15:04 +0000 (22:15 +0000)]
Merge "Volume: Persist unsafe volume playback time." into lmp-dev
Jay Civelli [Fri, 11 Jul 2014 21:56:46 +0000 (14:56 -0700)]
Add new intent to prompt user for their device credential. DO NOT MERGE
Bug:
16242766
cherry-pick from master
2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26
Change-Id: I76efb3bef888eb1e94c4e5455934816fb4acc5bc
John Spurlock [Fri, 25 Jul 2014 17:05:12 +0000 (13:05 -0400)]
Volume: Persist unsafe volume playback time.
Instead of warning after every reboot, remember the
playback time after a user confirmation and only
reset after the 20 hour playback threshold.
Bug:
16543104
Change-Id: I783358d97b88302a28fe77a8eb88bcd338ef1c87
John Spurlock [Fri, 25 Jul 2014 20:54:10 +0000 (20:54 +0000)]
Merge "Volume: Show safe media warning in settings." into lmp-dev
John Spurlock [Thu, 24 Jul 2014 22:10:48 +0000 (18:10 -0400)]
Volume: Show safe media warning in settings.
If the safe media warning is enabled, make sure
we display it from the new inline slider preference in
Settings (without showing the volume dialog itself).
Also:
- Update the warning dialog to the new sysui theme.
- Separate the warning sentences with an additional line.
- Fix the auto-dismiss timeout.
- Add a system property to additionally enable the safe
media warning for testing
- Add more information to audio service dumpsys.
Bug:
15434662
Change-Id: I95fec12c9049bbfdb7ebdf246160e4b12c0c5be3
Anish Athalye [Fri, 25 Jul 2014 18:26:29 +0000 (18:26 +0000)]
Merge "Fix bug in measurement of paragraphs" into lmp-dev
Yao Chen [Fri, 25 Jul 2014 18:22:55 +0000 (11:22 -0700)]
fix build
Change-Id: Id5a93019b60ac4881f398b80de2e14786776a883
Paul Soulos [Fri, 25 Jul 2014 00:17:42 +0000 (17:17 -0700)]
Adds getTypeLabel to ContactsContract Event
Bug:
16550284
Change-Id: Ie95093a2c9bca2b9ba130dea470c8beef94cd659
Fabrice Di Meglio [Fri, 25 Jul 2014 03:13:56 +0000 (20:13 -0700)]
Fix bug #
16307124 Not able to select hour 12 in TimePicker with 24-hour time enabled
- ahhh modulo ...
Change-Id: Ief08594590480bfcecc09cad1f782e57b05d9786
Yao Chen [Fri, 25 Jul 2014 17:51:09 +0000 (10:51 -0700)]
Fix build
Change-Id: Ia2a09417451dd9cdca0a6351b8ddd00f9195f361
Wei Wang [Fri, 25 Jul 2014 00:06:57 +0000 (17:06 -0700)]
Fix bug of ScanSettings. Add unit test.
b/
16318637.
Change-Id: I3fbc1212c1712faa0c29132f3dc9cfc1d58af26b
Anish Athalye [Fri, 25 Jul 2014 01:03:21 +0000 (18:03 -0700)]
Fix bug in measurement of paragraphs
This fixes b/
16510772.
When measuring paragraphs, leading margins should be taken into account.
When computing line width, the margin should be added to the absolute
value of the extent (there were missing parenthesis). Both of these
caused views with leading margins to be rendered incorrectly.
Change-Id: I5029b2790a249192a858eb226d7b793d0622a70d
Craig Mautner [Fri, 25 Jul 2014 17:43:37 +0000 (17:43 +0000)]
am
a9c5257a: am
a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit '
a9c5257a15f2efb5c017d2ecadb5a7360230bfee':
Finish crashed activities immediately
Alan Viverette [Fri, 25 Jul 2014 20:52:44 +0000 (20:52 +0000)]
Merge "Remove content description from SearchView text field" into lmp-dev
Alan Viverette [Fri, 25 Jul 2014 20:51:57 +0000 (13:51 -0700)]
Remove content description from SearchView text field
BUG:
16519353
Change-Id: I4df5e1e04fdf0d625e42f70f67657c5107f1443b
RoboErik [Fri, 25 Jul 2014 20:29:59 +0000 (13:29 -0700)]
Add clean step to remove old framework intermediates
The framework intermediates path moved. Failing to notice this will
cause your classpath to be wrong and you'll get red on new aidl methods.
This removes the old path which makes it more obvious that it's moved.
Change-Id: If1a36fefc703b7899e09687e2de598c3830fa72e
Tyler Gunn [Fri, 25 Jul 2014 20:17:40 +0000 (20:17 +0000)]
Merge "Adding missing break statement in VideoCallProvider." into lmp-dev
Tyler Gunn [Fri, 25 Jul 2014 20:04:31 +0000 (13:04 -0700)]
Adding missing break statement in VideoCallProvider.
Related to cl/510948
Bug:
16494880
Bug:
16495203
Change-Id: I4de0dccb886efbd119bd75b1285fdc84210c94fb
Alan Viverette [Fri, 25 Jul 2014 20:09:43 +0000 (20:09 +0000)]
Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev
Alan Viverette [Fri, 25 Jul 2014 19:57:31 +0000 (12:57 -0700)]
Remove duplicate Toolbar method for setting content description
Also moves the setNavigationIcon(int) method closer to the one that
takes a Drawable.
BUG:
16491458
Change-Id: Ia02f05e6270c9d420f61f7ab34117b4c7e6548ec
Behdad Esfahbod [Fri, 25 Jul 2014 19:30:49 +0000 (19:30 +0000)]
Merge "Further centralize Minikin interaction" into lmp-dev
Behdad Esfahbod [Fri, 25 Jul 2014 18:54:46 +0000 (14:54 -0400)]
Further centralize Minikin interaction
Part of the fix for bug
15246510 and others.
Change-Id: Ie99000989dfcd7a81aaa1233dec522344f852f31
Zhijun He [Sat, 26 Jul 2014 00:57:24 +0000 (00:57 +0000)]
Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
Fabrice Di Meglio [Sat, 26 Jul 2014 00:33:51 +0000 (17:33 -0700)]
Fix permission icons size to 24dp
See bug: #
14258811 Permissions icons are not visible in App info
Change-Id: Ib77bae60d4a14163c72fdeb4cb084ddbd739f69b
Sandeep Siddhartha [Fri, 25 Jul 2014 17:49:34 +0000 (10:49 -0700)]
Fix various bugs with model management
- Tie the sound model and keyphrase for simplicity
We won't support multiple keyphrases in a single model out of the box.
The db schema will need to be changed by the OEM wishing to add multiple hotwords.
This is because we currently have no way to test the flow and make sure that things work well with multiple keyphrases
and also the framework only reads the metadata for one keyphrase.
- Make the delete/update operations atomic
- Make the flow of data from Enrollment -> VIMS; the large sound model doesn't cross the process boundary any other time.
This is achieved by passing they key around, instead of the model themselves.
- Add a specific delete operation in DatabaseHelper rather than relying on emptying the keyphrases to delete.
Bug:
16555803
Bug:
16516353
Change-Id: I1e0cce137517502a669e431ca7e9f9f755598328
Zhijun He [Wed, 23 Jul 2014 20:42:11 +0000 (13:42 -0700)]
CamcorderProfiles: add high speed profile constants
Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
Behdad Esfahbod [Fri, 25 Jul 2014 19:29:27 +0000 (19:29 +0000)]
Merge "Remove unused TextLayout.h" into lmp-dev