OSDN Git Service
Diego Perez [Mon, 3 Aug 2015 21:40:47 +0000 (21:40 +0000)]
am
405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '
405eceb20a3f3e7a22d922fc2d0fb8283be337fa':
Restore session params "no decoration" flag
Deepanshu Gupta [Mon, 3 Aug 2015 21:34:35 +0000 (21:34 +0000)]
am
d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '
d985e3b61990837711d1f26def51caa76b9be473':
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in
78aa664.
Diego Perez [Mon, 3 Aug 2015 21:33:24 +0000 (21:33 +0000)]
Merge "Restore session params "no decoration" flag" into mnc-dev
Deepanshu Gupta [Mon, 3 Aug 2015 21:27:50 +0000 (21:27 +0000)]
Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* changes:
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in
78aa664.
Jeff Sharkey [Mon, 3 Aug 2015 21:03:39 +0000 (21:03 +0000)]
am
3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '
3ba2bfa7b280bac76d4d60a7f548c5e06aaca569':
Expand ringtone titles to support OGG and FLAC.
Jeff Sharkey [Mon, 3 Aug 2015 20:54:32 +0000 (20:54 +0000)]
Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
Jeff Sharkey [Mon, 3 Aug 2015 20:25:24 +0000 (13:25 -0700)]
Expand ringtone titles to support OGG and FLAC.
These file types don't have "audio/" MIME type, so check for those
MIME types explicitly.
Bug:
22803550
Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
Wale Ogunwale [Mon, 3 Aug 2015 20:40:37 +0000 (20:40 +0000)]
am
f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit '
f85769797e14f0d10dcc99d695c6dee1eb56bd9c':
Also consider task intent when trimming recent tasks
Alan Viverette [Mon, 3 Aug 2015 20:35:20 +0000 (20:35 +0000)]
am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
7b4170fa7f944e4cd73f1e82b56b4467de60d96c':
Update Material link text to be colorAccent
Jim Miller [Mon, 3 Aug 2015 20:35:13 +0000 (20:35 +0000)]
am
45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '
45fcaa547dc5b9eb2c20879b290415daa1446004':
Don't wipe device because of short PIN, patterns or passwords
Wale Ogunwale [Mon, 3 Aug 2015 20:31:31 +0000 (20:31 +0000)]
Merge "Also consider task intent when trimming recent tasks" into mnc-dev
Alan Viverette [Mon, 3 Aug 2015 20:28:59 +0000 (20:28 +0000)]
am
ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '
ef3f58e59ba44b2679e98ccb46d588eba2c99cac':
Make ResolverDrawerLayout look like a ScrollView to accessibility
Alan Viverette [Mon, 3 Aug 2015 20:28:51 +0000 (20:28 +0000)]
am
e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '
e76bf46ab9d59592a06fbb3fcff826a50d548b9f':
Add badge content description to TargetInfo, use in ResolverActivity
Alan Viverette [Mon, 3 Aug 2015 20:27:17 +0000 (20:27 +0000)]
Merge "Update Material link text to be colorAccent" into mnc-dev
Jim Miller [Mon, 3 Aug 2015 20:25:00 +0000 (20:25 +0000)]
Merge "Don't wipe device because of short PIN, patterns or passwords" into mnc-dev
Alan Viverette [Mon, 3 Aug 2015 20:17:57 +0000 (20:17 +0000)]
Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
Alan Viverette [Mon, 3 Aug 2015 20:17:31 +0000 (20:17 +0000)]
Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
Billy Lau [Mon, 3 Aug 2015 20:01:10 +0000 (20:01 +0000)]
am
5680f9f6: Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit '
5680f9f6d669e7d2f45db1027d53359b9ad327ff':
Bug:
22879202 App compatibility with WRITE_SETTINGS failing
Billy Lau [Mon, 3 Aug 2015 19:53:28 +0000 (19:53 +0000)]
Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
Svetoslav Ganov [Mon, 3 Aug 2015 19:52:57 +0000 (19:52 +0000)]
am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
87920455ae63deb0b7d14df06edeb879e6494cc1':
Fix NPE in AppOpsService
Svetoslav Ganov [Mon, 3 Aug 2015 19:52:51 +0000 (19:52 +0000)]
am
0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev
* commit '
0855357c4fec1fddb4ebf20d9e7986090962f99d':
User correct category for finding headless sync adapters
Svetoslav Ganov [Mon, 3 Aug 2015 19:41:34 +0000 (19:41 +0000)]
Merge "Fix NPE in AppOpsService" into mnc-dev
Svetoslav Ganov [Mon, 3 Aug 2015 19:41:15 +0000 (19:41 +0000)]
Merge "User correct category for finding headless sync adapters" into mnc-dev
Jim Miller [Sat, 1 Aug 2015 01:42:53 +0000 (18:42 -0700)]
Don't wipe device because of short PIN, patterns or passwords
This fixes a bug where we were counting short PIN, patterns and
passwords as attempts. For devices with a device policy admin,
this would cause devices to get wiped after a short amount of
interaction with the UI.
Fixes bug
22844609
Change-Id: I7616b38d954f89d4a2cee23f9aec1b898041b1f2
Deepanshu Gupta [Mon, 3 Aug 2015 18:25:45 +0000 (11:25 -0700)]
Revert to using AppTheme for LayoutLib tests.
Use AppTheme for all tests other than testExpand. AppTheme contains an
attribute needed by testArrayCheck. Also, since the AppTheme extends
Theme.Material.Light.DarkActionBar, other tests should be unaffected.
Also, update the golden image for the testArrayCheck.
Change-Id: Ib5f53f3b029c5aceef2b622e5ac63952d6b1972a
Lajos Molnar [Mon, 3 Aug 2015 18:27:13 +0000 (18:27 +0000)]
am
0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '
0ca1e98fdf300ddbbccbfce26bba5947109597f1':
media: Clarify MediaCodec and CodecCapabilities documentation
Lajos Molnar [Mon, 3 Aug 2015 18:17:57 +0000 (18:17 +0000)]
Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
Todd Kennedy [Mon, 3 Aug 2015 18:05:20 +0000 (18:05 +0000)]
am
772c6c0d: am
40f0efe0: Merge "Add a trace constant for PackageManager"
* commit '
772c6c0d2d62af7295030ded14b3f428ab325ef4':
Add a trace constant for PackageManager
Todd Kennedy [Mon, 3 Aug 2015 17:54:53 +0000 (17:54 +0000)]
am
40f0efe0: Merge "Add a trace constant for PackageManager"
* commit '
40f0efe03df87cf340de089bcb09010a88f8a120':
Add a trace constant for PackageManager
Todd Kennedy [Mon, 3 Aug 2015 17:44:45 +0000 (17:44 +0000)]
Merge "Add a trace constant for PackageManager"
Deepanshu Gupta [Mon, 3 Aug 2015 17:23:56 +0000 (10:23 -0700)]
Fix Matrix_Delegate.native_getValues()
The bug manifested itself by not rendering the wifi icon in the status
bar.
Change-Id: I7debf3eef387965d774bf66e856812e67c8552a7
Todd Kennedy [Mon, 3 Aug 2015 16:56:07 +0000 (09:56 -0700)]
Add a trace constant for PackageManager
Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7
Alan Viverette [Mon, 3 Aug 2015 16:42:14 +0000 (12:42 -0400)]
Update Material link text to be colorAccent
Bug:
22918108
Change-Id: I29b795b4c8d2a017dcaca1a9b65705eafaf2140c
Ruben Brunk [Mon, 3 Aug 2015 16:16:21 +0000 (16:16 +0000)]
am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
7469060e7855ca5b32f66fbad1a0a4f88737c754':
Make vendor keys visible in Camera2 java APIs.
Ruben Brunk [Mon, 3 Aug 2015 16:09:07 +0000 (16:09 +0000)]
Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
Jason Monk [Mon, 3 Aug 2015 15:23:19 +0000 (15:23 +0000)]
am
66845a36: Add more dump info about emergency calls state
* commit '
66845a36c9eeca5296a2bf86793a5d6bedac1b36':
Add more dump info about emergency calls state
Jason Monk [Mon, 3 Aug 2015 15:09:41 +0000 (11:09 -0400)]
Add more dump info about emergency calls state
Bug:
21549528
Change-Id: Idbd70e2f4b1b3285af283a28dc1933c02ad8d04c
Alan Viverette [Mon, 3 Aug 2015 14:01:23 +0000 (10:01 -0400)]
Make ResolverDrawerLayout look like a ScrollView to accessibility
Disable accessibility focus on the layout itself and expose the class
name as ScrollView so that we can get auto-scroll working until we have
first-class support for specifying automatic scrolling behavior.
Bug:
22667764
Change-Id: I9b97e40f16038046898e5b56b935a61db9073ac6
Diego Perez [Mon, 3 Aug 2015 13:20:18 +0000 (14:20 +0100)]
Restore session params "no decoration" flag
This seems to have removed from a previous version and the theme editor
relies on it to remove the decoration around the preview.
Change-Id: Ifab99e9c1689bfe44ca593e8c66c24e57c3e8c4c
Svet Ganov [Sun, 2 Aug 2015 17:09:56 +0000 (10:09 -0700)]
Fix NPE in AppOpsService
bug:
22802981
Change-Id: I73eee5ff9cf1603d8f30355554ef075aa14afd30
Wale Ogunwale [Sun, 2 Aug 2015 00:19:21 +0000 (17:19 -0700)]
Also consider task intent when trimming recent tasks
7cbfcd88657ac7d5ab1baf8c964b669c9bd21e24 we stopped comparing
the tasks realActivity when trimming recent task. This led to
task with the same intent been duplicated in the recents list.
We now consider the task intent when deciding when to trim like
we did pre
510e554283d3dc250f836cd3e4abc36d87319333.
Bug:
22812470
Bug:
22564474
Bug:
18642190
Change-Id: I90b3ab9cf7a06b4691099f697e723d8a54def9fa
Svet Ganov [Sat, 1 Aug 2015 19:19:26 +0000 (12:19 -0700)]
User correct category for finding headless sync adapters
bug:
22857409
Change-Id: Icc42f1af72c59fba3c60e1bcd558c621df70940a
Billy Lau [Sat, 1 Aug 2015 12:16:25 +0000 (13:16 +0100)]
Bug:
22879202 App compatibility with WRITE_SETTINGS failing
Fix a bug in the app ops protected permission check that broke backwards
compatibility.
Change-Id: Ic73759edd29a479a670fb31407e36aa50d09b6c3
Svetoslav Ganov [Sat, 1 Aug 2015 02:37:32 +0000 (02:37 +0000)]
am
8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '
8dbd48485044b1ab25fb8fb5e8e9b9772a3478c4':
Add per UID control to app ops.
Svetoslav Ganov [Sat, 1 Aug 2015 02:28:02 +0000 (02:28 +0000)]
Merge "Add per UID control to app ops." into mnc-dev
Svet Ganov [Thu, 30 Jul 2015 15:44:20 +0000 (08:44 -0700)]
Add per UID control to app ops.
The app ops mananger service maintains a mapping from UID to
a list of packages where each package is mapped to a list of
non-default app op states (default states are inferred and
not stored). Hence, specifying the app op state for a UID
requires setting the app op for each package in the shared
UID.
This is problematic when installing new packages if there
is a non-default app op policy set for another already
installed package in the same UID as the app op for the new
package has to be updated to be in sync. The package installer
cannot do this as it is in another process and the app op
update will not be atomic. Therefore, the app ops manager
service has to support specifying app op policy on a per
UID basis.
We now have a UID state object that contains the per package
non-default app op states as well as the per uid non-default
app op states. If there is a UID policy specified then it
takes precedence over the per package one. Even further,
changing the uid policy updates the package policies in this
UID if the state is non-default. Changing a package app op
state also updates the app op state for the whole UID if
the per UID policy for this op is non-default. Clearing the
app op state for a package, clears the policy for the UID
as well.
bug:
22802981
Change-Id: I78044906d9fcc6066abf07e706c2c88f3397d293
Jan Nordqvist [Sat, 1 Aug 2015 00:39:22 +0000 (00:39 +0000)]
am
cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev
* commit '
cb9c0940d4090f83b5ba76ef1413c2d14f7fdc1b':
Added logging in a few error paths for wifi config installation.
Jan Nordqvist [Sat, 1 Aug 2015 00:30:42 +0000 (00:30 +0000)]
Merge "Added logging in a few error paths for wifi config installation." into mnc-dev
Jan Nordqvist [Fri, 31 Jul 2015 22:32:25 +0000 (15:32 -0700)]
Added logging in a few error paths for wifi config installation.
Bug:
22790527
Change-Id: I71b298b98da098f647f52886c3c3a7456cb24d51
Chris Wren [Sat, 1 Aug 2015 00:18:31 +0000 (00:18 +0000)]
am
6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev
* commit '
6e75e7dd988d7704a01528f479421ab5e6012c99':
Instrument printing service for metrics collection.
Ruben Brunk [Thu, 30 Jul 2015 01:19:11 +0000 (18:19 -0700)]
Make vendor keys visible in Camera2 java APIs.
- Add vendor keys to getKeys() calls for CameraCharacteristics,
CaptureRequest, and CaptureResult.
- Vendors can specify whether custom keys show up by listing
visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field.
- Vendor key types are always treated as a primitive (or Rational)
array type corresponding to one of the valid types for
a camera metadata entry.
Bug:
22067625
Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
Chris Wren [Sat, 1 Aug 2015 00:11:16 +0000 (00:11 +0000)]
Merge "Instrument printing service for metrics collection." into mnc-dev
Selim Cinek [Fri, 31 Jul 2015 23:49:14 +0000 (23:49 +0000)]
am
f92a1fdb: Fixed a bug where notifications shadows were blinking out
* commit '
f92a1fdb77311149189ae17244adc51017b89c1e':
Fixed a bug where notifications shadows were blinking out
Yusuke Sato [Fri, 31 Jul 2015 23:34:06 +0000 (23:34 +0000)]
am
b98e2353: am
158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '
b98e235364c2b221521f622c546733b2862e4677':
Distinguish user-requested shutdown from power-related ones
Yusuke Sato [Fri, 31 Jul 2015 23:25:48 +0000 (23:25 +0000)]
am
158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '
158560ad66f860ab9bb822f98a0ef9cf3afa922f':
Distinguish user-requested shutdown from power-related ones
Selim Cinek [Fri, 31 Jul 2015 23:10:32 +0000 (16:10 -0700)]
Fixed a bug where notifications shadows were blinking out
Bug:
22567770
Change-Id: I2d335241a287d0c64e659221994f19b7c13eccd3
Yusuke Sato [Fri, 31 Jul 2015 23:13:16 +0000 (23:13 +0000)]
Merge "Distinguish user-requested shutdown from power-related ones"
Filip Gruszczynski [Fri, 31 Jul 2015 22:36:54 +0000 (22:36 +0000)]
am
00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev
* commit '
00ab35783c3909c783effbf28da6dda2bf67c1a8':
Make enter reveal animation be zorder top.
Dianne Hackborn [Fri, 31 Jul 2015 22:36:46 +0000 (22:36 +0000)]
am
fb68b0ad: Merge "Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit '
fb68b0ad344edbba15b961dc444cb24dcfc29995':
Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Filip Gruszczynski [Fri, 31 Jul 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Make enter reveal animation be zorder top." into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 22:29:34 +0000 (22:29 +0000)]
Merge "Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
Jean-Michel Trivi [Fri, 31 Jul 2015 22:25:57 +0000 (22:25 +0000)]
am
ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
* commit '
ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75':
Fix that shutter sound does not play after ringer mode changes to vibrator
Jean-Michel Trivi [Fri, 31 Jul 2015 22:18:35 +0000 (22:18 +0000)]
Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
Lajos Molnar [Thu, 30 Jul 2015 17:14:16 +0000 (10:14 -0700)]
media: Clarify MediaCodec and CodecCapabilities documentation
Bug:
21932760
Bug:
22847191
Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
Alan Viverette [Fri, 31 Jul 2015 21:38:52 +0000 (21:38 +0000)]
am
5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev
* commit '
5cca30a4ee28a5e70531508d9ad607107adfaa86':
Revert two changes to LinearLayout measurement
Alan Viverette [Fri, 31 Jul 2015 21:38:46 +0000 (21:38 +0000)]
am
9d8a230f: Revert "View measurement optimization"
* commit '
9d8a230fbd71ac57ef806326f15fa133ba125083':
Revert "View measurement optimization"
Alan Viverette [Fri, 31 Jul 2015 21:30:48 +0000 (21:30 +0000)]
Merge "Revert two changes to LinearLayout measurement" into mnc-dev
Alan Viverette [Fri, 31 Jul 2015 20:46:56 +0000 (16:46 -0400)]
Add badge content description to TargetInfo, use in ResolverActivity
Bug:
22667344
Change-Id: Iee241b9179c74a15b1c635cf90d2f96f6f7b31cd
Deepanshu Gupta [Fri, 31 Jul 2015 20:11:23 +0000 (13:11 -0700)]
Update test image for upated nav icons.
The image shows the nav icons to be separated by a significant distance.
This is because the switch to wide-screen layout happens based on
shortest width. The layout has a small shortest width and hence it uses
the phone layout for a horizontal nav bar and it doesn't look nice. Real
devices will never have this config, so it's okay.
Change-Id: Ic494ee7fdfb1116db39bcab6d6ee7a1e514b23df
Dianne Hackborn [Fri, 31 Jul 2015 20:10:55 +0000 (13:10 -0700)]
Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Change-Id: I928882d42d0546cc6a12e803d96131beaba76d4e
Deepanshu Gupta [Fri, 31 Jul 2015 20:10:18 +0000 (13:10 -0700)]
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Change-Id: Ia8d223ae01f08df945ab05615b07075b98a54a32
Deepanshu Gupta [Fri, 31 Jul 2015 18:33:25 +0000 (11:33 -0700)]
Fix bugs introduced in
78aa664.
Fix a couple of bugs (ArrayIndexOutOfBoundsException due to
miscalculation and a typo - swapped src and dst) introduced in the CL:
78aa664 Poor implementation of Path.approximate()
Change-Id: Iff7dbbf66d2714df51699ddb9a4169c38feefa7b
Winson Chung [Fri, 31 Jul 2015 19:59:01 +0000 (19:59 +0000)]
am
c35e670d: Moving removeTask to separate thread.
* commit '
c35e670d5386eb6388eb4e65746b950265312e7a':
Moving removeTask to separate thread.
Alan Viverette [Fri, 31 Jul 2015 19:51:48 +0000 (19:51 +0000)]
Revert "View measurement optimization"
LinearLayout relied on multiple measurement passes to hide a
discrepancy between EXACTLY and non-EXACTLY measurements.
This reverts commit
9cefbda11ee5308145d58b0b99ced0f66a0b1cf9.
Bug:
22810327
Change-Id: I515a80749420d00efc5002fa68221b7c236f03df
Winson Chung [Fri, 31 Jul 2015 01:08:26 +0000 (18:08 -0700)]
Moving removeTask to separate thread.
Bug:
22760556
Change-Id: Iac6eef77e3ba5432ac1cd4aa792e7b2aadc27c01
Filip Gruszczynski [Fri, 31 Jul 2015 19:20:40 +0000 (12:20 -0700)]
Make enter reveal animation be zorder top.
This fixes the bug where launcher icons become temporarily visible when
home button is pressed while other activity is starting. By having the
starting activity's animation be zoder top, it will continue to be drawn
on top of the launcher until it animates away.
Bug:
22809202
Change-Id: If5e3c09b7a5df4537c355f94e986766f77ad4943
Winson Chung [Fri, 31 Jul 2015 19:31:22 +0000 (19:31 +0000)]
am
92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev
* commit '
92e0c86fa2b84619ebc3acb6d91434dd17113c61':
Ensuring that we don't try to use and propagate null activity labels.
Deepanshu Gupta [Fri, 31 Jul 2015 19:31:14 +0000 (19:31 +0000)]
Winson Chung [Fri, 31 Jul 2015 19:20:51 +0000 (19:20 +0000)]
Merge "Ensuring that we don't try to use and propagate null activity labels." into mnc-dev
Deepanshu Gupta [Fri, 31 Jul 2015 19:11:07 +0000 (12:11 -0700)]
Fix build.
Change-Id: I82295b758e5ceb42e260d3c36ea2310a9def5190
Wale Ogunwale [Fri, 31 Jul 2015 18:53:35 +0000 (18:53 +0000)]
am
f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev
* commit '
f7e00dbd08038d52c1158eea61e253ff8155569b':
Fixed issue with artifacts during scale-up transition animation
Winson Chung [Fri, 31 Jul 2015 00:33:31 +0000 (17:33 -0700)]
Ensuring that we don't try to use and propagate null activity labels.
- Also fixes issue with tapping outside bounds not working to dismiss recents
Bug:
21774486
Bug:
22241587
Change-Id: Ib50f6fece8fb150929a1f8cdb01b8e8fe7b665cd
Wale Ogunwale [Fri, 31 Jul 2015 18:45:08 +0000 (18:45 +0000)]
Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 18:26:19 +0000 (18:26 +0000)]
am
ebbc891a: Merge "Fix build." into mnc-dev
* commit '
ebbc891ae4ca835dea278430e3bad42d4630e2af':
Fix build.
Dianne Hackborn [Fri, 31 Jul 2015 18:19:11 +0000 (18:19 +0000)]
Merge "Fix build." into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 18:17:43 +0000 (11:17 -0700)]
Fix build.
Change-Id: I9c6b6cd354039ff2914837cfe97a783564ded66f
Glenn Kasten [Fri, 31 Jul 2015 18:10:39 +0000 (18:10 +0000)]
am
37f559be: Merge "Improve getTimestamp documentation" into mnc-dev
* commit '
37f559be42ef7a765c671cc0852289a9d7e047cc':
Improve getTimestamp documentation
Glenn Kasten [Fri, 31 Jul 2015 18:04:16 +0000 (18:04 +0000)]
Merge "Improve getTimestamp documentation" into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 17:43:08 +0000 (17:43 +0000)]
Dianne Hackborn [Fri, 31 Jul 2015 17:43:06 +0000 (17:43 +0000)]
am
c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '
c1836bb0f1bf3e5ef0911719525da0bab3e53507':
Change MNC codename to just M.
Dianne Hackborn [Fri, 31 Jul 2015 17:35:34 +0000 (10:35 -0700)]
Fix build.
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
Dianne Hackborn [Wed, 29 Jul 2015 22:20:21 +0000 (15:20 -0700)]
Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
Dianne Hackborn [Fri, 31 Jul 2015 17:11:58 +0000 (17:11 +0000)]
Merge "Change MNC codename to just M." into mnc-dev
Alan Viverette [Fri, 31 Jul 2015 16:42:10 +0000 (12:42 -0400)]
Revert two changes to LinearLayout measurement
"Include non-zero dimension views in excess space calculation" and
"Always distribute excess space in LinearLayout measurement" changed
LinearLayout behavior significantly in a way that wasn't covered by
CTS tests.
This reverts commits
da2f3044092318d44173bdb9918f31c592b86a73 and
4fabc021583cfd5cc551eda7d7b9809683a6ca9a.
Bug:
22862047
Change-Id: I8d37a525ccf295445d3239b80e5cacb10bf3c947
Sungmin Choi [Mon, 27 Jul 2015 06:09:49 +0000 (23:09 -0700)]
Fix that shutter sound does not play after ringer mode changes to vibrator
Reproduce sequence:
1. Change ring volume to vibration in Settings > Sound & notification
> Ring volume using touch
2. Launch camera app
3. Capture, but cannot hear shutter sound
4. Even change ringtone to maximum, shutter sound is not played before reboot
Bug:
22589664
Change-Id: I90eb044eaf21f3b558bf050bf1d9f0b33ea4888b
Tyler Gunn [Fri, 31 Jul 2015 15:50:21 +0000 (15:50 +0000)]
am
d0694da4: Merge "Add telecom extra keys required for DMR release." into mnc-dev
* commit '
d0694da4fb85bb01e7c0ea7989a78a0e635453ac':
Add telecom extra keys required for DMR release.
Tyler Gunn [Fri, 31 Jul 2015 15:42:48 +0000 (15:42 +0000)]
Merge "Add telecom extra keys required for DMR release." into mnc-dev
Julia Reynolds [Fri, 31 Jul 2015 13:56:56 +0000 (13:56 +0000)]
am
5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '
5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
Fix SysUI crash on device boot.
Julia Reynolds [Fri, 31 Jul 2015 13:49:26 +0000 (13:49 +0000)]
Merge "Fix SysUI crash on device boot." into mnc-dev
Julia Reynolds [Fri, 31 Jul 2015 13:17:20 +0000 (09:17 -0400)]
Fix SysUI crash on device boot.
Bug:
22869066
Change-Id: I55ab64c430899ebc20bfc8a8e4d1e2a7cd12f0cd