OSDN Git Service
Alan Viverette [Mon, 3 Aug 2015 22:39:32 +0000 (22:39 +0000)]
am
e0d8a6ff: am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
e0d8a6ff60e253fe29083a29bc00e1839953bc4f':
Update Material link text to be colorAccent
Jim Miller [Mon, 3 Aug 2015 22:39:24 +0000 (22:39 +0000)]
am
3f9b9f2b: am
45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '
3f9b9f2bbe81e25cfc2754e19a129895f8ad1011':
Don't wipe device because of short PIN, patterns or passwords
Alan Viverette [Mon, 3 Aug 2015 22:39:17 +0000 (22:39 +0000)]
am
ce337493: am
ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '
ce337493fda60ac571287d011f9821d33b2caeb6':
Make ResolverDrawerLayout look like a ScrollView to accessibility
Alan Viverette [Mon, 3 Aug 2015 22:39:11 +0000 (22:39 +0000)]
am
42c9b35f: am
e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '
42c9b35fa293589b63c847ad9399ba8648ca7fb2':
Add badge content description to TargetInfo, use in ResolverActivity
Billy Lau [Mon, 3 Aug 2015 22:39:00 +0000 (22:39 +0000)]
am
f83e8526: am
5680f9f6: Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit '
f83e852661e9e42087e48af3010b210474349f33':
Bug:
22879202 App compatibility with WRITE_SETTINGS failing
Svetoslav Ganov [Mon, 3 Aug 2015 22:38:53 +0000 (22:38 +0000)]
am
688efe5d: am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
688efe5da94ec632af548c5f5bc4b46fad23165c':
Fix NPE in AppOpsService
Svetoslav Ganov [Mon, 3 Aug 2015 22:38:46 +0000 (22:38 +0000)]
am
c2003e1e: am
0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev
* commit '
c2003e1eba4a0bc98452a2b425e7d8dc99337e73':
User correct category for finding headless sync adapters
Lajos Molnar [Mon, 3 Aug 2015 22:38:29 +0000 (22:38 +0000)]
am
2f501cc0: am
0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '
2f501cc00a09d328e39e4c02aa72b894624acf54':
media: Clarify MediaCodec and CodecCapabilities documentation
Geoff Mendal [Mon, 3 Aug 2015 22:37:56 +0000 (22:37 +0000)]
am
91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
91ddd4ad1368db5fb304f4640c7fb1e2678fbb6b':
Import translations. DO NOT MERGE
Ruben Brunk [Mon, 3 Aug 2015 22:37:47 +0000 (22:37 +0000)]
am
b1286a7a: am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
b1286a7a7202388c307469344e0079c1651fd8d6':
Make vendor keys visible in Camera2 java APIs.
Jason Monk [Mon, 3 Aug 2015 22:37:35 +0000 (22:37 +0000)]
am
819df4f8: am
66845a36: Add more dump info about emergency calls state
* commit '
819df4f8fd22b650720a1b80323f6baa282a41d3':
Add more dump info about emergency calls state
Geoff Mendal [Mon, 3 Aug 2015 22:37:20 +0000 (22:37 +0000)]
am
32caf077: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
32caf0778a0e4db0c97a1b2f153699b58f13a8ab':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Aug 2015 22:37:13 +0000 (22:37 +0000)]
am
db76ee0a: (-s ours) Import translations. DO NOT MERGE
* commit '
db76ee0a6873b42156d9ab6060ec996940d677ed':
Import translations. DO NOT MERGE
Alan Viverette [Mon, 3 Aug 2015 20:33:05 +0000 (20:33 +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:33:00 +0000 (20:33 +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
Alan Viverette [Mon, 3 Aug 2015 20:27:17 +0000 (20:27 +0000)]
Merge "Update Material link text to be colorAccent" into mnc-dev
Alan Viverette [Mon, 3 Aug 2015 20:26:58 +0000 (20:26 +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:26:51 +0000 (20:26 +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
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:00:55 +0000 (20:00 +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:50:55 +0000 (19:50 +0000)]
am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
87920455ae63deb0b7d14df06edeb879e6494cc1':
Fix NPE in AppOpsService
Svetoslav Ganov [Mon, 3 Aug 2015 19:50:48 +0000 (19:50 +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
Lajos Molnar [Mon, 3 Aug 2015 18:25:18 +0000 (18:25 +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
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
Geoff Mendal [Mon, 3 Aug 2015 16:25:58 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Ruben Brunk [Mon, 3 Aug 2015 16:16:12 +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
Geoff Mendal [Mon, 3 Aug 2015 16:02:23 +0000 (11:02 -0500)]
Import translations. DO NOT MERGE
Change-Id: I1e66c1b10c0bd0e13369aeb3a24c219afc45d4e9
Auto-generated-cl: translation import
Jason Monk [Mon, 3 Aug 2015 15:23:17 +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
Geoff Mendal [Mon, 3 Aug 2015 14:00:37 +0000 (14:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 3 Aug 2015 13:55:08 +0000 (06:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I35c0512c48a8b1d8f4cb738a879d58421df8d747
Auto-generated-cl: translation import
Geoff Mendal [Mon, 3 Aug 2015 13:55:06 +0000 (06:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7cd5e910c7761119f5185926bfe09870a68abad
Auto-generated-cl: translation import
Svet Ganov [Sun, 2 Aug 2015 17:09:56 +0000 (10:09 -0700)]
Fix NPE in AppOpsService
bug:
22802981
Change-Id: I73eee5ff9cf1603d8f30355554ef075aa14afd30
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
Geoff Mendal [Sat, 1 Aug 2015 05:38:29 +0000 (05:38 +0000)]
am
1491492a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
1491492a1bdb5b9d0be68f9f34460d155a72e10e':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 05:29:57 +0000 (05:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 1 Aug 2015 05:29:06 +0000 (00:29 -0500)]
Import translations. DO NOT MERGE
Change-Id: I6fa255b9e0118457ee08fb14a503504631889c9d
Auto-generated-cl: translation import
Geoff Mendal [Sat, 1 Aug 2015 05:19:06 +0000 (05:19 +0000)]
am
335ffd32: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
335ffd32d2cbe40cbe56bedd742433c987228023':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 05:19:01 +0000 (05:19 +0000)]
am
8fbed3d1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8fbed3d1a4c666c562fe5efd2b9d72375c453497':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 05:14:27 +0000 (05:14 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 1 Aug 2015 05:12:03 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 1 Aug 2015 03:37:35 +0000 (20:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: If10ca2d47b314ddab9e7ae7b475d55eb4ce4d519
Auto-generated-cl: translation import
Geoff Mendal [Sat, 1 Aug 2015 03:34:13 +0000 (20:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I067b513b8b2344bd2f8ee9960ddcc5000e7173c3
Auto-generated-cl: translation import
Svetoslav Ganov [Sat, 1 Aug 2015 02:44:08 +0000 (02:44 +0000)]
am
1eb06eaa: am
8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '
1eb06eaaef5b56cd71a7cc7e9f5cd5d2b199f420':
Add per UID control to app ops.
Svetoslav Ganov [Sat, 1 Aug 2015 02:37:46 +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
Jan Nordqvist [Sat, 1 Aug 2015 00:47:40 +0000 (00:47 +0000)]
am
4fcbabb2: am
cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev
* commit '
4fcbabb2e8cd17300a29dce019b0bdbe3140a0ed':
Added logging in a few error paths for wifi config installation.
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
Peng Xu [Sat, 1 Aug 2015 00:39:43 +0000 (00:39 +0000)]
am
fcc33738: Merge "Suppress camera launch gesture until setup is complete Bug:
22792563" into mnc-dr-dev
* commit '
fcc33738186440daed339cf647d56de5fc9d0c66':
Suppress camera launch gesture until setup is complete Bug:
22792563
Jan Nordqvist [Sat, 1 Aug 2015 00:39:20 +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.
Peng Xu [Sat, 1 Aug 2015 00:35:22 +0000 (00:35 +0000)]
Merge "Suppress camera launch gesture until setup is complete Bug:
22792563" into mnc-dr-dev
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
Chris Wren [Sat, 1 Aug 2015 00:21:56 +0000 (00:21 +0000)]
am
ca3a3650: am
6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev
* commit '
ca3a3650e41449eb9d3b9643e844b7506d77759f':
Instrument printing service for metrics collection.
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:16:59 +0000 (00:16 +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 [Sat, 1 Aug 2015 00:02:57 +0000 (00:02 +0000)]
am
e681aed1: am
f92a1fdb: Fixed a bug where notifications shadows were blinking out
* commit '
e681aed17f346e0c7d22bdd177828419e02ec6ec':
Fixed a bug where notifications shadows were blinking out
Selim Cinek [Fri, 31 Jul 2015 23:53:33 +0000 (23:53 +0000)]
am
f92a1fdb: Fixed a bug where notifications shadows were blinking out
* commit '
f92a1fdb77311149189ae17244adc51017b89c1e':
Fixed a bug where notifications shadows were blinking out
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
Filip Gruszczynski [Fri, 31 Jul 2015 22:45:41 +0000 (22:45 +0000)]
am
3249330c: am
00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev
* commit '
3249330c593442d9a2b45f5e4598451d71b7ebd3':
Make enter reveal animation be zorder top.
Dianne Hackborn [Fri, 31 Jul 2015 22:45:34 +0000 (22:45 +0000)]
am
6aa0843e: am
fb68b0ad: Merge "Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit '
6aa0843ed95d3af828c8dc415053b91f3db25fac':
Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Filip Gruszczynski [Fri, 31 Jul 2015 22:36:53 +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:49 +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
Jean-Michel Trivi [Fri, 31 Jul 2015 22:35:42 +0000 (22:35 +0000)]
am
de680550: am
ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
* commit '
de680550e4e77627f01ae4dff7b3fb8c6e08bd18':
Fix that shutter sound does not play after ringer mode changes to vibrator
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:47 +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
Alan Viverette [Fri, 31 Jul 2015 21:49:41 +0000 (21:49 +0000)]
am
7bfe7b5b: am
5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev
* commit '
7bfe7b5b541e3b4585c3ef7eb6d4fb3bd9218df0':
Revert two changes to LinearLayout measurement
Alan Viverette [Fri, 31 Jul 2015 21:49:34 +0000 (21:49 +0000)]
am
0568a230: am
9d8a230f: Revert "View measurement optimization"
* commit '
0568a230b34f879215e65fbaa79dfa377085bb41':
Revert "View measurement optimization"
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:39:03 +0000 (21:39 +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:59 +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
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
Winson Chung [Fri, 31 Jul 2015 20:02:40 +0000 (20:02 +0000)]
am
c8222f40: am
c35e670d: Moving removeTask to separate thread.
* commit '
c8222f40fcea5912d7154858bf6de5fa95083e40':
Moving removeTask to separate thread.
Winson Chung [Fri, 31 Jul 2015 19:55:40 +0000 (19:55 +0000)]
am
c35e670d: Moving removeTask to separate thread.
* commit '
c35e670d5386eb6388eb4e65746b950265312e7a':
Moving removeTask to separate thread.
Winson Chung [Fri, 31 Jul 2015 19:54:54 +0000 (19:54 +0000)]
am
183b589f: am
92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev
* commit '
183b589fd4e3381a5f64f2782f3fffad9dd25b0e':
Ensuring that we don't try to use and propagate null activity labels.
Deepanshu Gupta [Fri, 31 Jul 2015 19:54:47 +0000 (19:54 +0000)]
Wale Ogunwale [Fri, 31 Jul 2015 19:54:36 +0000 (19:54 +0000)]
am
88cf6d62: am
f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev
* commit '
88cf6d625cff9e19f5ec95dd9ee9599a6ffe1501':
Fixed issue with artifacts during scale-up transition animation
Dianne Hackborn [Fri, 31 Jul 2015 19:54:30 +0000 (19:54 +0000)]
am
5c8072df: am
ebbc891a: Merge "Fix build." into mnc-dev
* commit '
5c8072df22bf9febcf2e8e08bf440341bf789991':
Fix build.
Glenn Kasten [Fri, 31 Jul 2015 19:54:16 +0000 (19:54 +0000)]
am
22057e06: am
37f559be: Merge "Improve getTimestamp documentation" into mnc-dev
* commit '
22057e06ac7fd00025c32e6e2c017fc8deff63cc':
Improve getTimestamp documentation
Dianne Hackborn [Fri, 31 Jul 2015 19:53:59 +0000 (19:53 +0000)]
Dianne Hackborn [Fri, 31 Jul 2015 19:53:51 +0000 (19:53 +0000)]
am
9b36f526: am
c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '
9b36f526dd0378bda8f71c0e51ed37bf97742f8f':
Change MNC codename to just M.
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
Winson Chung [Fri, 31 Jul 2015 19:43:30 +0000 (19:43 +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:43:25 +0000 (19:43 +0000)]