OSDN Git Service
android-build-team Robot [Thu, 3 May 2018 13:39:29 +0000 (06:39 -0700)]
Merge "old paths contains all entries when updating" into pi-dev
am:
f5cb5e5525
Change-Id: I13b2118b834e9f255c83cf737ae1d9e8d93c9245
android-build-team Robot [Thu, 3 May 2018 13:26:50 +0000 (13:26 +0000)]
Merge "old paths contains all entries when updating" into pi-dev
Richard Uhler [Thu, 3 May 2018 13:13:07 +0000 (06:13 -0700)]
Merge "Fix leak of WeakReferences on mThemeRefs list." into pi-dev
am:
7790f2a4e1
Change-Id: Ia6d0946520165519c2256ab0714a216ac495d45f
Richard Uhler [Thu, 3 May 2018 13:02:35 +0000 (13:02 +0000)]
Merge "Fix leak of WeakReferences on mThemeRefs list." into pi-dev
Nicolas Geoffray [Thu, 3 May 2018 12:19:56 +0000 (05:19 -0700)]
Merge "Add IWindowManager.setAnimationScales to light grey." into pi-dev
am:
91a14dec3c
Change-Id: I6acaab5436c5bfc0e9f5bedce7c3974bb1b756b1
Android Build Merger (Role) [Thu, 3 May 2018 12:15:58 +0000 (12:15 +0000)]
Merge "[automerger skipped] Merge "Add static IpClient logging" am:
8285261133 am:
d81625a7a9 -s ours" into pi-dev-plus-aosp
Erik Kline [Thu, 3 May 2018 12:15:34 +0000 (05:15 -0700)]
[automerger skipped] Merge "Add static IpClient logging" am:
8285261133
am:
d81625a7a9 -s ours
Change-Id: If8e8dc57346e315462c4a6ff020f7dee16115d76
Nicolas Geoffray [Thu, 3 May 2018 12:14:53 +0000 (05:14 -0700)]
Merge "More light grey apis." into pi-dev
am:
eb368af5b0
Change-Id: Id9952a143670b739becf3d45d2ef2f8dee6266c6
Nicolas Geoffray [Thu, 3 May 2018 12:08:14 +0000 (12:08 +0000)]
Merge "Add IWindowManager.setAnimationScales to light grey." into pi-dev
Erik Kline [Thu, 3 May 2018 12:05:05 +0000 (05:05 -0700)]
Merge "Add static IpClient logging"
am:
8285261133
Change-Id: Id566002382162a848de91b85559e69bc6f7ea28d
Nicolas Geoffray [Thu, 3 May 2018 12:04:21 +0000 (12:04 +0000)]
Merge "More light grey apis." into pi-dev
Erik Kline [Thu, 3 May 2018 10:44:30 +0000 (10:44 +0000)]
Merge "Add static IpClient logging"
android-build-team Robot [Thu, 3 May 2018 10:16:20 +0000 (03:16 -0700)]
Merge "Turn on QuickStep onboarding" into pi-dev
am:
5ab7aa816e
Change-Id: Ida6d4731bb5aeb860a8847d1fd7c71cf197c3a29
android-build-team Robot [Thu, 3 May 2018 10:08:23 +0000 (10:08 +0000)]
Merge "Turn on QuickStep onboarding" into pi-dev
Todd Kennedy [Wed, 2 May 2018 09:59:45 +0000 (10:59 +0100)]
old paths contains all entries when updating
In certains circumstances, only the base and split APKs were included in
the "old paths" list when updating the application info. Instead, this
list should contain _all_ elements, including any additional libraries
that may be added to the overall classpath.
Bug:
77342775
Test: Manual. Install a package. Install a split with --dont_kill. See that the path doesn't contain duplicate entries
Change-Id: Id9739cce215ab07bff1b17966583c0cf51a0b34a
android-build-team Robot [Thu, 3 May 2018 09:51:05 +0000 (02:51 -0700)]
Merge "Fixes non-matching instant app behavior" into pi-dev
am:
8d9f844004
Change-Id: Ic61ea35272cbf2d2e544f6aa3f7463f44de89ad0
android-build-team Robot [Thu, 3 May 2018 09:36:52 +0000 (09:36 +0000)]
Merge "Fixes non-matching instant app behavior" into pi-dev
Richard Uhler [Thu, 26 Apr 2018 14:09:30 +0000 (15:09 +0100)]
Fix leak of WeakReferences on mThemeRefs list.
Periodically remove references from the list whose referents have been
garbage collected.
Bug:
73961798
Test: Device boots.
Test: Take a heap dump of systemui and manually check that the state of
ThemeRefs looks reasonable.
Change-Id: I691027feb5dd217bcb60406b28897b9614e2a845
Erik Kline [Tue, 1 May 2018 07:51:44 +0000 (16:51 +0900)]
Add static IpClient logging
Support keeping IpClient logs around and dumping them
during dumpsys. Previously we got this benefit for
wifi by virtue of WifiStateMachine's long-lived nature.
Now that this is changing we need to be sure we have
logs, and this method gets us Ethernet logs as well.
Bug:
62476366
Bug:
77999594
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- dumpsys connmetrics [ipclient] works
Merged-In: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Merged-In: Ie947394fabcaca7fc1d067f095c2442ee2704593
Change-Id: I1136a83de8097fdb4130debe1eaf689be7132fe5
(cherry picked from commit
3f8306b8c56b58054800a576912204e8bf66f9f4)
android-build-team Robot [Thu, 3 May 2018 08:30:22 +0000 (01:30 -0700)]
Merge "Add static IpClient logging" into pi-dev
am:
5402b60bfa
Change-Id: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Mathew Inwood [Thu, 3 May 2018 08:21:40 +0000 (01:21 -0700)]
Merge "Pass package name to runtime." into pi-dev
am:
e9db89cc76
Change-Id: I4b64ad026f53dc2abbf36017b425c70c74ad0a91
android-build-team Robot [Thu, 3 May 2018 08:19:43 +0000 (08:19 +0000)]
Merge "Add static IpClient logging" into pi-dev
Mathew Inwood [Thu, 3 May 2018 08:12:02 +0000 (08:12 +0000)]
Merge "Pass package name to runtime." into pi-dev
Shaowei Shen [Thu, 3 May 2018 02:17:34 +0000 (19:17 -0700)]
Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev
am:
49a987c277
Change-Id: I74ab1b5d58d1daf58284a648daf7c5ff72ed0a49
Shaowei Shen [Thu, 3 May 2018 02:05:17 +0000 (02:05 +0000)]
Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev
Tracy Zhou [Thu, 3 May 2018 01:13:04 +0000 (18:13 -0700)]
Merge "Update QuickScrub tip according to the latest spec." into pi-dev
am:
63b6275a2b
Change-Id: I177be0db1396681b879b1d5c9c8bbad86d59d030
Tracy Zhou [Thu, 3 May 2018 01:01:58 +0000 (01:01 +0000)]
Merge "Update QuickScrub tip according to the latest spec." into pi-dev
android-build-team Robot [Thu, 3 May 2018 00:28:38 +0000 (17:28 -0700)]
Merge "Fix a condition to reset the current spell checker" into pi-dev
am:
18f730cc00
Change-Id: If53849072e284f05589804a26caee621305fa797
android-build-team Robot [Thu, 3 May 2018 00:14:23 +0000 (00:14 +0000)]
Merge "Fix a condition to reset the current spell checker" into pi-dev
android-build-team Robot [Wed, 2 May 2018 23:52:28 +0000 (16:52 -0700)]
Merge "Quickscrub will hide the most right buttons on nav bar" into pi-dev
am:
56f39770ea
Change-Id: I7d9bbcc6a8f107142ecf019ae2444e8ffa181980
android-build-team Robot [Wed, 2 May 2018 23:40:06 +0000 (23:40 +0000)]
Merge "Quickscrub will hide the most right buttons on nav bar" into pi-dev
android-build-team Robot [Wed, 2 May 2018 23:40:03 +0000 (16:40 -0700)]
Merge "Fix a race in spell checker session handling" into pi-dev
am:
bca85a0d44
Change-Id: I36d43f060c838776e637c48976318c2bf6d55449
android-build-team Robot [Wed, 2 May 2018 23:31:38 +0000 (23:31 +0000)]
Merge "Fix a race in spell checker session handling" into pi-dev
android-build-prod (mdb) [Wed, 2 May 2018 23:02:56 +0000 (16:02 -0700)]
[automerger skipped] Merge "don't block adb while running uninstall" am:
17280c61d3
am:
76ef10f320 -s ours
Change-Id: I479732dda962dae7c04651bb2717e62a6dd05afe
android-build-prod (mdb) [Wed, 2 May 2018 22:49:21 +0000 (15:49 -0700)]
Merge "don't block adb while running uninstall"
am:
17280c61d3
Change-Id: Ida023bd6f9ba2b309e9443561f9fae43afea15fb
Yi Jin [Wed, 2 May 2018 22:10:58 +0000 (15:10 -0700)]
Merge "Add a section flag to bypass failure if a specific path can't be found." into pi-dev
am:
e09cde0cd9
Change-Id: I01c5a7a2c1ead02f5af0514cf9bf9b83f1682316
Farid Zare Seisan [Wed, 2 May 2018 22:02:23 +0000 (15:02 -0700)]
Merge "UserDataPrepare: CE storage property set too early." into pi-dev
am:
85c7a9a113
Change-Id: I996d587a63d02abceb268471ec5711ec60a71e49
Yi Jin [Wed, 2 May 2018 21:36:23 +0000 (21:36 +0000)]
Merge "Add a section flag to bypass failure if a specific path can't be found." into pi-dev
Tracy Zhou [Tue, 1 May 2018 23:28:51 +0000 (16:28 -0700)]
Update QuickScrub tip according to the latest spec.
- Treat inreaction to the tip as 1st dismissal.
- Show tip after 1st dismissal based on Overview opened count instead of
app launch count.
Bug:
70180942
Test: manual test
Change-Id: I4410c78ac547ad49bd135dede71e79aaca2e1b10
Farid Zare Seisan [Wed, 2 May 2018 21:29:17 +0000 (21:29 +0000)]
Merge "UserDataPrepare: CE storage property set too early." into pi-dev
Jeff Sharkey [Wed, 2 May 2018 21:29:10 +0000 (14:29 -0700)]
Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev
am:
f7d3e028ae
Change-Id: I61692ebdc49233923863ce773bb42a07498551b0
android-build-prod (mdb) [Wed, 2 May 2018 21:27:00 +0000 (21:27 +0000)]
Merge "don't block adb while running uninstall"
Matthew Ng [Thu, 26 Apr 2018 22:23:27 +0000 (15:23 -0700)]
Quickscrub will hide the most right buttons on nav bar
When scrub occurs, it will fade out the container of the navigation bar
menu buttons and animate them back when scrub ends.
Fixes:
77338303
Test: enable magnify in accessibility settings and drag home
Change-Id: Ic5df73b980c2cb20a135b20a9f84002f107db1c0
android-build-team Robot [Wed, 2 May 2018 21:17:18 +0000 (14:17 -0700)]
Merge "Preventing zombie process creation." into pi-dev
am:
ca6f36532d
Change-Id: Ie0c1ea1d658f719262f3e7473046a732915d7284
Jeff Sharkey [Wed, 2 May 2018 21:14:17 +0000 (21:14 +0000)]
Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev
Selim Cinek [Wed, 2 May 2018 21:02:11 +0000 (14:02 -0700)]
Merge "Fix incorrect icon alignment on shelf" into pi-dev
am:
33540449fc
Change-Id: I11b7166b0179b28a347dfa017f7681ef5e93c1fd
android-build-team Robot [Wed, 2 May 2018 20:58:14 +0000 (20:58 +0000)]
Merge "Preventing zombie process creation." into pi-dev
Ryan Mitchell [Wed, 2 May 2018 20:43:45 +0000 (13:43 -0700)]
Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev
am:
150bafd217
Change-Id: I5bb4a63234cf3ee022bbf59edd5b613abefd8bef
Selim Cinek [Wed, 2 May 2018 20:36:24 +0000 (20:36 +0000)]
Merge "Fix incorrect icon alignment on shelf" into pi-dev
Lucas Dupin [Wed, 2 May 2018 20:35:45 +0000 (13:35 -0700)]
Merge "Fix NPE when casting" into pi-dev
am:
9115d371c3
Change-Id: I03443603d0d05b164031c439e6a897238cf56be0
Ryan Mitchell [Wed, 2 May 2018 20:23:49 +0000 (20:23 +0000)]
Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev
Lucas Dupin [Wed, 2 May 2018 20:20:51 +0000 (20:20 +0000)]
Merge "Fix NPE when casting" into pi-dev
android-build-team Robot [Wed, 2 May 2018 19:52:01 +0000 (12:52 -0700)]
Merge "Invoke create_recording_canvas correctly in macro bench tests" into pi-dev
am:
f28901f6c5
Change-Id: I855fec4f3cf126485999a008cec9648967cbf21f
android-build-team Robot [Wed, 2 May 2018 19:47:11 +0000 (12:47 -0700)]
Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev
am:
057698e511
Change-Id: Ibe278a8d5830b7345de40feda17390e09d3dab20
android-build-team Robot [Wed, 2 May 2018 19:42:24 +0000 (12:42 -0700)]
[automerger skipped] Merge changes from topic "ifaceStatsDetail" into pi-dev
am:
e696cf636d -s ours
Change-Id: Ia25540fd865f6040e2a5d943c19b2a12965c4d5b
android-build-team Robot [Wed, 2 May 2018 19:38:43 +0000 (19:38 +0000)]
Merge "Invoke create_recording_canvas correctly in macro bench tests" into pi-dev
Chenbo Feng [Wed, 2 May 2018 19:32:53 +0000 (12:32 -0700)]
[automerger skipped] Remove the unused file parsing function
am:
bbabc51b5b -s ours
Change-Id: I264e9826246ebfc74cf74f8af623a428909a56e3
Chia-I Wu [Wed, 2 May 2018 19:26:19 +0000 (12:26 -0700)]
Merge "Update Configuration#isScreenWideColorGamut doc" into pi-dev
am:
067749725e
Change-Id: Iab37f1e40eb80790192645839a023fc295448c7f
android-build-team Robot [Wed, 2 May 2018 19:22:15 +0000 (19:22 +0000)]
Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev
android-build-team Robot [Wed, 2 May 2018 19:17:27 +0000 (19:17 +0000)]
Merge changes from topic "ifaceStatsDetail" into pi-dev
* changes:
Remove the unused file parsing function
Use eBPF map data for per iface stats
Chia-I Wu [Wed, 2 May 2018 19:15:11 +0000 (19:15 +0000)]
Merge "Update Configuration#isScreenWideColorGamut doc" into pi-dev
Android Build Merger (Role) [Wed, 2 May 2018 18:49:23 +0000 (18:49 +0000)]
Merge "Merge "Fix DemoMode icon spacing" into pi-dev am:
ee18fb2112" into pi-dev-plus-aosp
android-build-team Robot [Wed, 2 May 2018 18:49:00 +0000 (11:49 -0700)]
Merge "Fix DemoMode icon spacing" into pi-dev
am:
ee18fb2112
Change-Id: Ifce54c5b7c817b2fc625b6363980e877eea4d8ea
Yang Lu [Wed, 2 May 2018 18:43:26 +0000 (11:43 -0700)]
Merge "Lock the pulling alarm handler." into pi-dev
am:
493bb2b119
Change-Id: I91bc58bf99a1834821f88aeee3f1ce99da9861e5
Gopinath Elanchezhian [Wed, 2 May 2018 18:39:07 +0000 (11:39 -0700)]
Merge "Add 'ss' trace category in app launch test." into pi-dev
am:
0b96d863c6
Change-Id: I5a140a7372c64687c3073405ef2c41d38f61dc03
android-build-team Robot [Wed, 2 May 2018 18:30:13 +0000 (18:30 +0000)]
Merge "Fix DemoMode icon spacing" into pi-dev
wangmingming1 [Tue, 10 Apr 2018 01:35:25 +0000 (09:35 +0800)]
don't block adb while running uninstall
Test: Manual
1. setup a work profile
2. set a uninstall restriction on foo app for the work profile
by calling set DevicePolicyManager.setUninstallBlocked()
3. observe adb uninstallation can return with 'DELETE_FAILED_OWNER_BLOCKED'
message without blocking forever by using the following command line:
`adb uninstall --user user-id-of-work-profile com.foo`
Test: Manual
1. install lots of apks via adb
2. uninstall apks via adb
Change-Id: I68706782ae547250433e3dd8ff285d4932473033
Merged-In: If89978c5a79ef998bde55c254ced4b6a3ff6e645
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com>
Yang Lu [Wed, 2 May 2018 18:25:18 +0000 (18:25 +0000)]
Merge "Lock the pulling alarm handler." into pi-dev
Gopinath Elanchezhian [Wed, 2 May 2018 18:24:30 +0000 (18:24 +0000)]
Merge "Add 'ss' trace category in app launch test." into pi-dev
Lucas Dupin [Wed, 2 May 2018 07:33:17 +0000 (00:33 -0700)]
Fix NPE when casting
We didn't have any tests that guarantee that the keyguard casting flow
wouldn't be broken by updates on KeyguardStatusView.
Such test was created
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardPresentationTest.java
Change-Id: I44f66be770ea2263fbf183bc438d1cedaa6f589a
Fixes:
71696859
android-build-team Robot [Wed, 2 May 2018 18:05:11 +0000 (11:05 -0700)]
Merge "Work on issue #
77931346: The notification that should not be named appeared" into pi-dev
am:
12f404e3e3
Change-Id: I19f5b0cbafed7234e96edd0793413b37cd0a14a7
Evan Laird [Wed, 2 May 2018 17:58:28 +0000 (13:58 -0400)]
Use Wi-Fi content description in StatusBarWifiView
Test: turn on TalkBack, tap Wi-Fi
Change-Id: Ic8bea2c5643ff44dfb042fceba1e87e12462635f
Fixes:
78172399
android-build-team Robot [Wed, 2 May 2018 17:56:07 +0000 (10:56 -0700)]
Merge "Fixed that some notifications were expandable by just a few pixels" into pi-dev
am:
c5b780517e
Change-Id: I54279ec43c7c35d9d725cb67c6bf4c1511d5edaa
Ryan Mitchell [Fri, 27 Apr 2018 21:53:04 +0000 (14:53 -0700)]
AAPT2: Fix quoted text in res/xml assets
AAPT2 aggressively processed xml nodes and regressed from the behavior
of AAPT. This change restores AAPT's processing of xml nodes with
quotations.
Bug:
71805084
Test: Created tests in XmlFlattener_test.cpp and ran the test in the
Android Studio project given in the bug
Change-Id: Idedb4f1002e9fd705ceb5feae35289235b754b02
android-build-team Robot [Wed, 2 May 2018 17:47:15 +0000 (17:47 +0000)]
Merge "Work on issue #
77931346: The notification that should not be named appeared" into pi-dev
android-build-team Robot [Wed, 2 May 2018 17:44:17 +0000 (17:44 +0000)]
Merge "Fixed that some notifications were expandable by just a few pixels" into pi-dev
Chia-I Wu [Wed, 2 May 2018 17:13:22 +0000 (10:13 -0700)]
Update Configuration#isScreenWideColorGamut doc
Clarify that the method does not imply the screen is color-managed.
A global color transform may still be applied depending on the user
settings, such as night light, accessibility, Boosted, or Stretched.
Bug:
78012876
Test: builds
Change-Id: Ie9cdf455cf4ca93be2357a5313cd63555ab91ff9
Anton Hansson [Wed, 2 May 2018 17:24:32 +0000 (10:24 -0700)]
Merge "frameworks/base: Update a few more references to android.jar." am:
85e68063a9
am:
52e98e1b7a
Change-Id: Iffb2389f8ef3dcca139a99a617c2079910f3c902
Jack Yu [Wed, 2 May 2018 17:17:32 +0000 (10:17 -0700)]
Merge "Enabled area info update for India" into pi-dev
am:
530c4c1f0f
Change-Id: I30b0da9687004bd4696edba024f2fbf81128c324
Anton Hansson [Wed, 2 May 2018 17:17:13 +0000 (10:17 -0700)]
Merge "frameworks/base: Update a few more references to android.jar."
am:
85e68063a9
Change-Id: I6338218432a1e9d3f99b392f6736fa6452809b82
Jack Yu [Wed, 2 May 2018 17:11:09 +0000 (17:11 +0000)]
Merge "Enabled area info update for India" into pi-dev
android-build-team Robot [Wed, 2 May 2018 17:08:46 +0000 (10:08 -0700)]
Merge "Fix issue #
78230210: Strobe: Need separate runtime permission group for READ_CALL_LOG and WRITE_CALL_LOG" into pi-dev
am:
06defc2a31
Change-Id: I11e244ed55d75fa08b74dc588dd5cd3059997869
Hyunyoung Song [Wed, 2 May 2018 17:01:21 +0000 (10:01 -0700)]
Merge "Log OVERVIEW_ACTIVITY via MetricsLogger in quickstep Test: is done on ub-launcher3-edmonton branch that uses this library function Bug:
77920179" into pi-dev
am:
d7f98ac19e
Change-Id: If185b29c3fee95e34db0b4c9db8f7f095b16b516
android-build-team Robot [Wed, 2 May 2018 16:55:15 +0000 (16:55 +0000)]
Merge "Fix issue #
78230210: Strobe: Need separate runtime permission group for READ_CALL_LOG and WRITE_CALL_LOG" into pi-dev
Hyunyoung Song [Wed, 2 May 2018 16:52:45 +0000 (16:52 +0000)]
Merge "Log OVERVIEW_ACTIVITY via MetricsLogger in quickstep Test: is done on ub-launcher3-edmonton branch that uses this library function Bug:
77920179" into pi-dev
Victor Hsieh [Wed, 2 May 2018 16:50:11 +0000 (09:50 -0700)]
Avoid using 0 for fs-verity extension ID
am:
4cf738204f
Change-Id: I66b1205decd933f27c470537af271ac50f98973a
Evan Laird [Wed, 2 May 2018 16:47:26 +0000 (12:47 -0400)]
Fix DemoMode icon spacing
- Use the same margin on the left of Wi-Fi (2.5dp)
- DemoMode uses the padding of the view it's replacing, and WRAP_CONTENT
for the width of its children
- Fix DemoMode etc dot color
- Don't constrain number of icons if DemoMode is replacing an
unconstrained container
Test: visual;
adb shell settings put global sysui_demo_allowed 1 && \
adb shell am broadcast -a com.android.systemui.demo -e command clock -e hhmm 0900 && \
adb shell am broadcast -a com.android.systemui.demo -e command network -e wifi show -e level 4 && \
adb shell am broadcast -a com.android.systemui.demo -e command network -e mobile show -e datatype none -e level 4 && \
adb shell am broadcast -a com.android.systemui.demo -e command status -e bluetooth disconnected && \
adb shell am broadcast -a com.android.systemui.demo -e command battery -e level 100 -e plugged false
Change-Id: I1d1389f9c6d6cb7d6078af5bbe4bc21e42771560
Fixes:
79094455
Ryan Mitchell [Wed, 2 May 2018 16:42:11 +0000 (09:42 -0700)]
Merge "AAPT2: Fixed id parsing error" into pi-dev
am:
f4c089dd90
Change-Id: I81147ee8629edc98ba19565083c09d7dce8e6bf7
Victor Hsieh [Mon, 23 Apr 2018 21:43:19 +0000 (14:43 -0700)]
Avoid using 0 for fs-verity extension ID
Also:
* Adjust size and order of some fields
* Fix Merkle tree size calculation bug
Test: Verify fs-verity works with kernel patch
Bug:
67380979
Change-Id: I58f14cfe9630c1ff62ed64dbf333bb1c9bfe0fb1
Rohan Shah [Wed, 2 May 2018 16:32:04 +0000 (09:32 -0700)]
Merge "[Notif] Update guts/blocking helper UI" into pi-dev
am:
33b57e845f
Change-Id: Ie6d684ffb58feb5f64581e97b8fb48ee2d6ce982
Ryan Mitchell [Wed, 2 May 2018 16:27:03 +0000 (16:27 +0000)]
Merge "AAPT2: Fixed id parsing error" into pi-dev
Anton Hansson [Wed, 2 May 2018 16:25:42 +0000 (16:25 +0000)]
Merge "Update apidiff source files to use new api location." into pi-dev-plus-aosp
Rohan Shah [Wed, 2 May 2018 16:21:38 +0000 (16:21 +0000)]
Merge "[Notif] Update guts/blocking helper UI" into pi-dev
Selim Cinek [Wed, 2 May 2018 16:15:06 +0000 (09:15 -0700)]
Fixed that some notifications were expandable by just a few pixels
The minimum height for the content with an image was
incorrect and was unnecessarily leading to the notification
being expandable even though it shouldn't need to
Test: add notification with single line, no actions, image, observe not expandable
Change-Id: Ia0b5c976ccbee9d7419bb809123c348b310bc148
Fixes:
77823428
Adrian Roos [Wed, 2 May 2018 16:12:06 +0000 (09:12 -0700)]
[automerger skipped] Fix build more am:
d9d5f654c7 -s ours
am:
4b6a13ed45 -s ours
Change-Id: I702fa340b475688794ddb0e42a339f13e24b4770
Adrian Roos [Wed, 2 May 2018 16:09:14 +0000 (09:09 -0700)]
[automerger skipped] Fix build am:
3e0fd90693 -s ours
am:
fc1149dba1 -s ours
Change-Id: I6e1695d6074e6b95ea790a59a5d47be7190ac802
Adrian Roos [Wed, 2 May 2018 16:05:24 +0000 (09:05 -0700)]
[automerger skipped] OC-MR1 DisplayCutout XML API am:
361580459e -s ours
am:
14a40ac705 -s ours
Change-Id: Ieae717e3c775169cdcce0a488674fddf2c5933be
Adrian Roos [Wed, 2 May 2018 15:46:04 +0000 (08:46 -0700)]
[automerger skipped] Fix build more
am:
d9d5f654c7 -s ours
Change-Id: Id7d1d5f358c21e010530c0158ba72f4ccb8c6bf9
Adrian Roos [Wed, 2 May 2018 15:44:36 +0000 (08:44 -0700)]
[automerger skipped] Fix build
am:
3e0fd90693 -s ours
Change-Id: I814a48bdab01da6aab05b08ff58c688f4909170a
Adrian Roos [Wed, 2 May 2018 15:42:33 +0000 (08:42 -0700)]
[automerger skipped] OC-MR1 DisplayCutout XML API
am:
361580459e -s ours
Change-Id: Ibff9a5fd9396eb54264970f02c832a7d085a9648