OSDN Git Service
Evan Laird [Thu, 29 Jun 2017 02:18:56 +0000 (02:18 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev am:
423022e8ab
am:
f7ce0aac50
Change-Id: I05a2936907d2f75033608eb6d8cee2929c4c44da
Evan Laird [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
am:
423022e8ab
Change-Id: I5f81cfde196fc801c4141c35e708d8f27032c621
Lucas Dupin [Thu, 29 Jun 2017 02:03:27 +0000 (02:03 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev am:
4b535d93f7
am:
150123dbb7
Change-Id: I39a1e974135b963d182e53cc332b99507ed173c8
TreeHugger Robot [Thu, 29 Jun 2017 02:00:51 +0000 (02:00 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:55:59 +0000 (01:55 +0000)]
Merge "Update constant scope so it's accessible in app"
Lucas Dupin [Thu, 29 Jun 2017 01:53:04 +0000 (01:53 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
am:
4b535d93f7
Change-Id: I74f15490d9a71386230fd6f326bd0a1866c7f7d3
TreeHugger Robot [Thu, 29 Jun 2017 01:43:52 +0000 (01:43 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
* changes:
Revert "Replaced overlay target package"
Revert "Support dark text on Recents"
TreeHugger Robot [Thu, 29 Jun 2017 00:52:27 +0000 (00:52 +0000)]
Merge "Parcel: Use @CriticalNative when possible."
TreeHugger Robot [Thu, 29 Jun 2017 00:49:44 +0000 (00:49 +0000)]
Merge "Allow ALL_USERS in setUserRestrictionForUser"
Anthony Chen [Thu, 29 Jun 2017 00:43:58 +0000 (00:43 +0000)]
Merge "Use custom QS fragment for auto use-case."
Matthew Ng [Thu, 29 Jun 2017 00:23:30 +0000 (00:23 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev am:
eb36d83901
am:
3bff170ff5
Change-Id: Icc6d2455e03d77c52d42f2cf95cbcffb95045719
Matthew Ng [Thu, 29 Jun 2017 00:16:12 +0000 (00:16 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
am:
eb36d83901
Change-Id: I01f2882da4d75a127a872858b351130f6da6aa1e
TreeHugger Robot [Thu, 29 Jun 2017 00:09:25 +0000 (00:09 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
Mady Mellor [Thu, 29 Jun 2017 00:00:59 +0000 (00:00 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev am:
176f2533a1
am:
3e7a97f6fa
Change-Id: Ie79d0d1112c8cf840dbd1378d9f1959c6dd633df
Mady Mellor [Wed, 28 Jun 2017 23:53:23 +0000 (23:53 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
am:
176f2533a1
Change-Id: Ic5d38c862c155ac025884e53d688826b57829529
TreeHugger Robot [Wed, 28 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
Lucas Dupin [Wed, 28 Jun 2017 23:00:39 +0000 (16:00 -0700)]
Revert "Replaced overlay target package"
This reverts commit
ae885416dddd684fab2369fde234dc9e48db5051.
Lucas Dupin [Wed, 28 Jun 2017 23:00:26 +0000 (16:00 -0700)]
Revert "Support dark text on Recents"
This reverts commit
512ce6c9b75ce7d3f4f70280a414ab8fb994e809.
Evan Laird [Wed, 28 Jun 2017 22:00:02 +0000 (18:00 -0400)]
resolve merge conflicts of
91870d158748 to oc-dr1-dev
Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4
Charlie Wang [Wed, 28 Jun 2017 21:44:01 +0000 (21:44 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev am:
b5e79ad0d3
am:
029498f856
Change-Id: If23e825d4766199afea5a2113cd16a57ffe083eb
Alison Cichowlas [Wed, 28 Jun 2017 21:39:58 +0000 (21:39 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev am:
29c70316df
am:
bf373af414
Change-Id: I46980919de63e387c27c2feae9d328ece51c2dad
Phil Weaver [Wed, 28 Jun 2017 21:38:19 +0000 (21:38 +0000)]
Merge "Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff am:
aec87eab5b" into oc-dr1-dev-plus-aosp
am:
714407754b
Change-Id: I8fc71a231c9ebea8c731b176b51a0f16b2ba9442
Charlie Wang [Wed, 28 Jun 2017 21:37:55 +0000 (21:37 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
am:
b5e79ad0d3
Change-Id: I717159a360b1aeb2f928c88b76ad060f4d8516c7
Phil Weaver [Wed, 28 Jun 2017 21:36:39 +0000 (21:36 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff am:
2bf63f4fde
am:
3c7022a6ff
Change-Id: Ieffa4ba90349b9e771da9a07854e8af25cd68acd
Makoto Onuki [Wed, 28 Jun 2017 21:32:48 +0000 (21:32 +0000)]
Merge "Sort INSTRUMENTATION_STATUS keys on am instrument output"
Anthony Chen [Sat, 8 Apr 2017 00:19:54 +0000 (17:19 -0700)]
Use custom QS fragment for auto use-case.
Use a custom QS fragment if the UI mode is car. This fragment disables
the quick settings row and expansion. Remove the config options that
used to have disabled this in the phone QSFragment.
To accomplish this, introduce a new QSFooter interface. The old
QSFooter.java now implements this.
Test: boot on phone and Android Auto headunit
Bug:
33210494
Change-Id: I5accc2d27d6725380ca5e271d332a03991c9419b
Alison Cichowlas [Wed, 28 Jun 2017 21:30:46 +0000 (21:30 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
am:
29c70316df
Change-Id: Ia1864af61669029ac5596d3477b3d959e824422a
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
Android Build Merger (Role) [Wed, 28 Jun 2017 21:26:45 +0000 (21:26 +0000)]
Merge "Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff am:
aec87eab5b" into oc-dr1-dev-plus-aosp
Charlie Wang [Wed, 28 Jun 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 21:26:24 +0000 (21:26 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev am:
587b673e5b
am:
6d04eb6ce0
Change-Id: I4fd24b45df515473cea5510766679e3254614b11
Phil Weaver [Wed, 28 Jun 2017 21:25:36 +0000 (21:25 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff
am:
aec87eab5b
Change-Id: I615ef6fb2fa5786895a385f721bc929df780906f
Brad Ebinger [Wed, 28 Jun 2017 21:24:45 +0000 (21:24 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev am:
58d47a6f04 -s ours
am:
6d36b4a80e -s ours
Change-Id: Ic498b1f22d490201406d2b35fbf7c2e122bbc411
Phil Weaver [Wed, 28 Jun 2017 21:24:42 +0000 (21:24 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff
am:
2bf63f4fde
Change-Id: I5a6fe8947017b7a8b3cfdf41c4b5583dc114bf44
Fan Zhang [Wed, 28 Jun 2017 21:23:54 +0000 (14:23 -0700)]
Update constant scope so it's accessible in app
Bug:
63094854
Test: builds
Change-Id: Icff4c46927c4f5ceb9c7e073ca9566a9e88028c8
Alison Cichowlas [Wed, 28 Jun 2017 21:23:49 +0000 (21:23 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 21:19:19 +0000 (21:19 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
am:
587b673e5b
Change-Id: I0c7b9118cdf37f321772865caa835cdb76b79b97
Brad Ebinger [Wed, 28 Jun 2017 21:17:52 +0000 (21:17 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
am:
58d47a6f04 -s ours
Change-Id: Ie857dfb83ecbfd36f965ad91caddcf3b80848e20
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I5deb45f1e2b2c0f667c5a37e70cdabe643f905ee
Jason Monk [Wed, 28 Jun 2017 21:14:43 +0000 (21:14 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
Brad Ebinger [Wed, 28 Jun 2017 21:06:34 +0000 (21:06 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Hall Liu [Wed, 28 Jun 2017 20:59:45 +0000 (20:59 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb am:
761bad1c53 am:
8f42a3a281
am:
5f48b1bc02
Change-Id: I12300a1e96b97cfa47e7ff82e2ac50e7e9932eab
Hall Liu [Wed, 28 Jun 2017 20:58:37 +0000 (20:58 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb am:
8763c625a3 am:
fc156f357a
am:
b70e48b33b
Change-Id: I8e9dbb203bb91c5ef32c38e0cb7de6f854e05ce8
Hall Liu [Wed, 28 Jun 2017 20:53:00 +0000 (20:53 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb am:
761bad1c53
am:
8f42a3a281
Change-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c
Hall Liu [Wed, 28 Jun 2017 20:51:57 +0000 (20:51 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb am:
8763c625a3
am:
fc156f357a
Change-Id: I929fd3306a7bb8bbc2eeb31eb1732c99ec0fb743
Hall Liu [Wed, 28 Jun 2017 20:44:48 +0000 (20:44 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb
am:
761bad1c53
Change-Id: I7625defdce4fb4c69355f45d801729828646e659
Hall Liu [Wed, 28 Jun 2017 20:43:45 +0000 (20:43 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb
am:
8763c625a3
Change-Id: I6704e20ad1182fc8f97bd36700c54c3d2329da28
Alison Cichowlas [Wed, 28 Jun 2017 20:42:09 +0000 (16:42 -0400)]
This import got lost in the merge. Restore to fix build.
Test: built
Change-Id: Iba7e4449ed8ddfb535a45f087e3baf43b52a5f08
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit
913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)
TreeHugger Robot [Wed, 28 Jun 2017 20:37:24 +0000 (20:37 +0000)]
Merge "cas: convert MediaCas to HIDL"
Hall Liu [Wed, 28 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am:
c2f33f18eb
Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
Hall Liu [Wed, 28 Jun 2017 20:35:54 +0000 (20:35 +0000)]
Add download request tokens and enforce destination clear
am:
2043f70acb
Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
Hall Liu [Wed, 28 Jun 2017 20:26:15 +0000 (20:26 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
Implement the cleanup action in MbmsDownloadReceiver
Add download request tokens and enforce destination clear
Alison Cichowlas [Wed, 28 Jun 2017 20:24:38 +0000 (20:24 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev am:
e5c09e42eb
am:
948f788fdf
Change-Id: Ic0ee4d27690ba0f0ebdc50b1913c7c6c91e4b30b
Makoto Onuki [Wed, 28 Jun 2017 19:10:47 +0000 (12:10 -0700)]
Sort INSTRUMENTATION_STATUS keys on am instrument output
Previously the output from perftests was printed in a random order:
INSTRUMENTATION_STATUS: timeGetDataCapacity_standardDeviation=5
INSTRUMENTATION_STATUS: timeGetDataCapacity_median=486
INSTRUMENTATION_STATUS: timeGetDataCapacity_mean=489
INSTRUMENTATION_STATUS: timeGetDataCapacity_min=484
INSTRUMENTATION_STATUS_CODE: -1
Now it's always printed in the same (sorted) order.
INSTRUMENTATION_STATUS: timeGetDataCapacity_mean=489
INSTRUMENTATION_STATUS: timeGetDataCapacity_median=486
INSTRUMENTATION_STATUS: timeGetDataCapacity_min=484
INSTRUMENTATION_STATUS: timeGetDataCapacity_standardDeviation=5
INSTRUMENTATION_STATUS_CODE: -1
Test: manual test
Change-Id: I807aa05e6523b70a132ab97fc099156bb3dc1f96
Alison Cichowlas [Wed, 28 Jun 2017 20:17:11 +0000 (20:17 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
am:
e5c09e42eb
Change-Id: I7924f3e138bdd26e47e6f1c0c7f2526abc0b52f5
Mady Mellor [Wed, 7 Jun 2017 21:53:58 +0000 (14:53 -0700)]
Adjustments to PIP position while flinging
Rather than using a scroller, find the actual edge intercept
based on the trajectory of the fling.
This is done by finding the two points it could intersect with
and checking which point is 'closer' (i.e. would be hit first
by the PIP).
Bias towards using the intersection with the top / bottom edge
if the PIP is being flung along the side it's currently on.
Also increases the maximum time for the fling.
Bug:
35358634
Test: manual - fling PIP around screen while in landscape
and portrait
Change-Id: I26e943a5ddbc726ab86bc11e4271d4db034f3d47
Andrii Kulian [Wed, 28 Jun 2017 20:12:07 +0000 (20:12 +0000)]
Merge "Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1 am:
6355cb7afa" into oc-dr1-dev-plus-aosp
am:
db7140b519
Change-Id: I93e87cfaee719ddbf42f36dd059f669c46a76f93
Andrii Kulian [Wed, 28 Jun 2017 20:10:36 +0000 (20:10 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1 am:
cd02bf1676
am:
851f200b08
Change-Id: If1178cd4ba4861bc79afce001112fc442185aa5d
Alison Cichowlas [Wed, 28 Jun 2017 20:08:21 +0000 (20:08 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
Philip P. Moltmann [Fri, 23 Jun 2017 21:05:04 +0000 (14:05 -0700)]
Allow ALL_USERS in setUserRestrictionForUser
This will be used e.g. by the permission granting UI.
Fixes:
35612487
Test: 1. Installed facebook messanger and enabled chat-heads in private
profile
2. Opened work-profile camera which asks for location
permission
3. Chat head disappered during permission check
4. Chat head re-appeared after permission check
Change-Id: Ie9a5e5379c20972f34945c9cb062cd8e3df483d4
Android Build Merger (Role) [Wed, 28 Jun 2017 20:04:10 +0000 (20:04 +0000)]
Merge "Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1 am:
6355cb7afa" into oc-dr1-dev-plus-aosp
Scott Randolph [Wed, 28 Jun 2017 20:04:00 +0000 (20:04 +0000)]
Merge "Add getNavigationBarWindow override to CarStatusBar"
Andrii Kulian [Wed, 28 Jun 2017 20:03:04 +0000 (20:03 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1
am:
cd02bf1676
Change-Id: Ieb098ddfdfb5deeb8c505b96c010e1e4281b754c
Andrii Kulian [Wed, 28 Jun 2017 20:03:02 +0000 (20:03 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1
am:
6355cb7afa
Change-Id: Ic73a2d9b97901826e7697168238c932a1d70cf22
Andrii Kulian [Wed, 28 Jun 2017 19:56:48 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ib8d85b8c96ff2590669e39134623456a2004d008
Andrii Kulian [Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30
Andrii Kulian [Wed, 28 Jun 2017 19:50:27 +0000 (19:50 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
Alison Cichowlas [Wed, 28 Jun 2017 19:30:36 +0000 (19:30 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev am:
22f0dfcff5
am:
35ad165b21
Change-Id: I5256c7b22e1014b37b6970aa3376467ed577aed6
Alison Cichowlas [Wed, 28 Jun 2017 19:23:04 +0000 (19:23 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
am:
22f0dfcff5
Change-Id: I8a0cad0e372b39ce237e9ff82f959e0d4b3f05dd
Alison Cichowlas [Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
Lucas Dupin [Wed, 28 Jun 2017 18:49:56 +0000 (18:49 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev am:
b02863eba6
am:
c18147427d
Change-Id: I031c6948cb04e1fd25910070181615c6386cd90e
Alison Cichowlas [Wed, 28 Jun 2017 18:49:21 +0000 (14:49 -0400)]
Disable failing RoundedCornersTest
Bug:
63098063
Test: literally just test changes
Change-Id: Ibde220ccc049baa56f76c385543f97b241b4dc30
Lucas Dupin [Wed, 28 Jun 2017 18:42:00 +0000 (18:42 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
am:
b02863eba6
Change-Id: I81906c7fc634135f979316dd3c5d8d825bcf6c32
Lucas Dupin [Wed, 28 Jun 2017 18:34:28 +0000 (18:34 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
* changes:
Support dark text on Recents
Replaced overlay target package
Mady Mellor [Wed, 28 Jun 2017 18:28:46 +0000 (18:28 +0000)]
If the menu hasn't been created yet don't do things with it am:
104be2e019 am:
ded383d8b3
am:
748fe09e11
Change-Id: Ifb1223d4adcc55bb2ac6ced40a0714602a645775
Evan Laird [Wed, 28 Jun 2017 18:27:47 +0000 (14:27 -0400)]
Fix empty signal line thickness / color in status bar
Parameterize the line thickness to the height of the drawable. Also draw
the empty state as background signal instead of foreground.
Test: visual
Change-Id: I39a7ef3164b784008e3dba5284b7fe83e4666607
Fixes:
63097113
Mady Mellor [Wed, 28 Jun 2017 18:27:01 +0000 (18:27 +0000)]
Merge "If the menu hasn't been created yet don't do things with it am:
104be2e019 am:
ef9a16202d" into oc-dr1-dev-plus-aosp
am:
4c3896a9f0
Change-Id: I8a70521c35d472dfddbdf16f6dab1bedb1a4a9e1
Jason Monk [Wed, 28 Jun 2017 18:25:29 +0000 (18:25 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev am:
082a4e254f
am:
d2d5a95024
Change-Id: Ib450bbe504e18f3224b4a24631b64c7cc94fe2e8
Jason Monk [Wed, 28 Jun 2017 18:20:51 +0000 (18:20 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev am:
3ad6233685
am:
d16a69069a
Change-Id: I9c49b78fe8ac16bf56c88cd373e8ff51f9581e59
Mady Mellor [Wed, 28 Jun 2017 18:20:21 +0000 (18:20 +0000)]
If the menu hasn't been created yet don't do things with it am:
104be2e019
am:
ded383d8b3
Change-Id: Id4ca0a39f39855133b384f87bb535dd1f01f5a93
Android Build Merger (Role) [Wed, 28 Jun 2017 18:17:38 +0000 (18:17 +0000)]
Merge "If the menu hasn't been created yet don't do things with it am:
104be2e019 am:
ef9a16202d" into oc-dr1-dev-plus-aosp
Mady Mellor [Wed, 28 Jun 2017 18:16:02 +0000 (18:16 +0000)]
If the menu hasn't been created yet don't do things with it am:
104be2e019
am:
ef9a16202d
Change-Id: I3f8bbe102215bf3c15f9cfa1556a2a51fc66449c
Jason Monk [Wed, 28 Jun 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
am:
082a4e254f
Change-Id: I82666e8068b7c660052004f438333bfd0ec3150a
Adam Lesinski [Wed, 28 Jun 2017 18:15:14 +0000 (18:15 +0000)]
Merge "AAPT2: Emit more proguard keep rules for layouts and menus"
Jason Monk [Wed, 28 Jun 2017 18:13:35 +0000 (18:13 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
am:
3ad6233685
Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a
Lei Yu [Wed, 28 Jun 2017 18:13:02 +0000 (18:13 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev am:
a023184bbc
am:
eba86e5147
Change-Id: I537c1fd6b4fbf3e00269c50aebb23e9fd7fa3ad6
Mady Mellor [Wed, 28 Jun 2017 18:10:07 +0000 (18:10 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I6bf4197736f6a6c6760ac091a2ca71402e44dec8
Mady Mellor [Wed, 28 Jun 2017 18:08:52 +0000 (18:08 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I670206eb1da007b1eeea5f022124a352b0644b6a
Lei Yu [Wed, 28 Jun 2017 18:05:18 +0000 (18:05 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
am:
a023184bbc
Change-Id: Ibd5d41feaf18aacad79345404c944f365aa19587
Jason Monk [Wed, 28 Jun 2017 18:03:24 +0000 (18:03 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
Adam Lesinski [Mon, 26 Jun 2017 23:39:03 +0000 (16:39 -0700)]
AAPT2: Emit more proguard keep rules for layouts and menus
<fragment> tags in layouts use the class attribute to determine which
Fragment subclass to load, and fallback on android:name if class is not
set.
AAPT2 only emitted a proguard rule for the class attribute for <fragment>,
when it should emit a proguard rule for the android:name attribute as
well.
AAPT2 didn't handle menu XML, so support for actionViewClass,
actionProviderClass and onClick is added.
Bug:
62216174
Test: make aapt2_tests
Change-Id: Ie8675c2bd899a5b51f3661eb0901ab8c9a16fd70
Jason Monk [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:55:04 +0000 (17:55 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
Adam Lesinski [Wed, 28 Jun 2017 17:49:14 +0000 (17:49 +0000)]
Merge "AAPT2: Allow <key-sets> tags in AndroidManifest.xml"
Jeff Davidson [Wed, 28 Jun 2017 17:41:26 +0000 (17:41 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev am:
f28843dd3f
am:
53ad2499f1
Change-Id: I538f0405811b0df28960acdb6f275689f19185dc
Neil Fuller [Wed, 28 Jun 2017 17:34:45 +0000 (17:34 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am:
4e77ae6d1a am:
4a7e3de5e7 am:
c1bf6505c8
am:
77fb4c5b0e
Change-Id: I60b2a91b48413358d8912c06c78a987aae01c490
Jeff Davidson [Wed, 28 Jun 2017 17:33:01 +0000 (17:33 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
am:
f28843dd3f
Change-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429
OSDN Git Service
