OSDN Git Service
Todd Kennedy [Thu, 19 Nov 2015 18:54:57 +0000 (18:54 +0000)]
Merge "Allow ephemeral provider/installer"
Ben Kwa [Thu, 19 Nov 2015 18:52:55 +0000 (18:52 +0000)]
Merge "Tweak grid item layout. Adjust colors to match spec."
Felipe Leme [Thu, 19 Nov 2015 18:50:48 +0000 (18:50 +0000)]
Merge "Fixed typos."
Ben Kwa [Wed, 11 Nov 2015 05:02:47 +0000 (21:02 -0800)]
Tweak grid item layout. Adjust colors to match spec.
BUG=
10960718
BUG=
24326989
Change-Id: I74da23fe0b40d713a3f435d1467d26d707e76fca
Dianne Hackborn [Thu, 19 Nov 2015 18:48:46 +0000 (18:48 +0000)]
Merge "Implement flexible light idle maintenance windows."
Dianne Hackborn [Thu, 19 Nov 2015 18:47:53 +0000 (18:47 +0000)]
Merge "Move appops command to the service."
Jeff Sharkey [Thu, 19 Nov 2015 18:45:40 +0000 (18:45 +0000)]
Merge "More file-based encryption work."
Chris Wren [Thu, 19 Nov 2015 18:45:28 +0000 (18:45 +0000)]
Merge "allow devs to turn off charging notifications"
Filip Gruszczynski [Thu, 19 Nov 2015 18:27:01 +0000 (18:27 +0000)]
Merge "Fix crash when docking from recents."
Todd Kennedy [Wed, 18 Nov 2015 17:59:47 +0000 (09:59 -0800)]
Allow ephemeral provider/installer
The ephemeral provider is a service that simply determines whether or
not an ephemeral application is available. The ephemeral installer
does the heavy lifting of installing the ephemeral application.
Bug:
25119046
Change-Id: I591f4c2c3f2b149d299fa8b4f359f2582d9199cb
Filip Gruszczynski [Thu, 19 Nov 2015 02:01:27 +0000 (18:01 -0800)]
Fix crash when docking from recents.
The crash was happening because we were sending a future from sysui, but
that future would always return null animation specs when docking. This
makes it returns proper specs in that case. However, we need to still
protect ourselves from null specs when executing the future.
Bug:
25765339
Change-Id: I02d842ea31503169f6e053a1695d8896d2e4d97c
Chris Wren [Thu, 19 Nov 2015 18:03:15 +0000 (18:03 +0000)]
Merge "metrics for people validation"
Jeff Sharkey [Fri, 13 Nov 2015 04:17:45 +0000 (20:17 -0800)]
More file-based encryption work.
Add new "am unlock-user" command so we can trigger changes from the
command line.
Move FBE check to static method so it can safely be called early
during boot before the mount service is ready. Move FBE emulation
to persisted system property, and start reading/writing that value.
Change default permission grants to ignore current encryption-aware
flags, since many of the target apps aren't crypto aware.
Always prepare package data directories, which is how we create the
new "user_de" paths during boot.
Bug:
22358539
Change-Id: I6f58ea2d34b3a466d3775d614f8a13de92272621
Chris Wren [Thu, 19 Nov 2015 17:40:53 +0000 (12:40 -0500)]
allow devs to turn off charging notifications
in the same was as we allow then to turn of debuging notificaitons
this is useful for screenshots and demos
Change-Id: I6e95addec2917abdd619086ed68910097fb5b8aa
Chris Wren [Thu, 19 Nov 2015 17:39:38 +0000 (12:39 -0500)]
metrics for people validation
Change-Id: If53bb740ca3760e7335c93ad140bae2029d422b7
Philip P. Moltmann [Thu, 19 Nov 2015 16:56:57 +0000 (16:56 +0000)]
Merge "Do not restart printSpooler when switching portait mode / landscape mode"
Nicolas Geoffray [Thu, 19 Nov 2015 16:15:17 +0000 (16:15 +0000)]
Merge "Update framework code after new ART options." am:
d7d2817ade am:
9da4055766
am:
5d5f055eb6
* commit '
5d5f055eb6783dceb51cdb71630aac40feacfedd':
Update framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 16:05:01 +0000 (16:05 +0000)]
Merge "Update framework code after new ART options." am:
d7d2817ade
am:
9da4055766
* commit '
9da4055766fc7acf81dcd238204589ea1f484d50':
Update framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 15:54:21 +0000 (15:54 +0000)]
Merge "Update framework code after new ART options."
am:
d7d2817ade
* commit '
d7d2817ade8459a8f6872ff814d3208613502858':
Update framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 15:48:01 +0000 (15:48 +0000)]
Merge "Update framework code after new ART options."
Alan Viverette [Thu, 19 Nov 2015 14:50:40 +0000 (14:50 +0000)]
Merge "Apply VectorDrawable density scaling before applying theme"
Alan Viverette [Thu, 19 Nov 2015 14:47:09 +0000 (09:47 -0500)]
Apply VectorDrawable density scaling before applying theme
Refactors density handling to look more similar to GradientDrawable's
implementation, which should make things easier to maintain. We no
longer update density directly in updateStateFromTypedArray, instead
handling it in applyTheme() and inflate().
Lazily calculates local density-dependent dimensions and invalidates
when the constant state density changes, which should ensure a random
call to applyTheme() will still result in the correct intrinsic
dimensions.
Change-Id: I726878a6cd75d38a550637e3e7a7b6bc68bcaf6d
Nicolas Geoffray [Thu, 19 Nov 2015 13:48:35 +0000 (13:48 +0000)]
Update framework code after new ART options.
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
Julia Reynolds [Thu, 19 Nov 2015 13:58:25 +0000 (13:58 +0000)]
Merge "Remove 'peekable' preference."
Daichi Hirono [Thu, 19 Nov 2015 06:46:40 +0000 (06:46 +0000)]
Merge "Don't close database when all devices have been detached."
Daichi Hirono [Tue, 17 Nov 2015 01:55:45 +0000 (10:55 +0900)]
Don't close database when all devices have been detached.
ContentProvider is a singleton of the process. So it may live longer
than Service. We could not close database when the service is destroyed.
BUG=
25730042
Change-Id: I591250c1a1e7c5705eb2585c71cac2598c0c0fb9
Andreas Gampe [Thu, 19 Nov 2015 04:52:39 +0000 (20:52 -0800)]
resolve merge conflicts of
e3ad4409a6 to master.
Change-Id: Idc19d27ee359e5434d55d9a29ecdb4b1e30cbfe1
Yohei Yukawa [Wed, 18 Nov 2015 23:54:34 +0000 (15:54 -0800)]
Clear IMMS#mCurClient when it is dead.
Suppose the following case:
1. Launch an activity.
2. Focus in an EditText on the activity. IME is shown up.
3. Kill the activity process in a not graceful way, e.g.,
'adb shell kill'
After step 3, IMMS#removeClient(client) is immediately called back from
com.android.server.wm.Session, which is good, but we forgot to clear
IMMS#mCurClient to null.
Basically not clearing IMMS#mCurClient there is not so critical, because
1) we already have bunch of RemoteException check for the case where
IPC target is already dead, and in theory we cannot avoid this kind of
runtime error anyway, and 2) in most of cases new input method client
gains focus.
That said, in conjunction with other focus-related issues such
as bug #
25373872, not cleaning that can result in the following error
message in 'input_method:' section of bugreport, which might be a bit
confusing.
Input method client dead: android.os.DeadObjectException
The primary goal of this CL is to make bugreport less confusing. Any
user/developer-visible changes beyond that is unintentional.
Bug:
25373872
Change-Id: Iee001ad9cce0c8c6324e3c0984be1e6f0e641d05
Yohei Yukawa [Thu, 19 Nov 2015 03:45:57 +0000 (03:45 +0000)]
Merge "Have ControlledInputConnectionWrapper#toString()."
Sandra Kwan [Thu, 19 Nov 2015 03:45:19 +0000 (03:45 +0000)]
Merge "AccountManager: add startAddAccount API."
Nicolas Geoffray [Thu, 19 Nov 2015 03:25:45 +0000 (03:25 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
cf49583bd0 am:
5485d81578
am:
5462e46d23
* commit '
5462e46d23800bc480d31d73c21d6089ce299d25':
Remove DEBUG_JIT from Zygote flags.
Wale Ogunwale [Thu, 19 Nov 2015 03:23:55 +0000 (03:23 +0000)]
Merge "Fix build breakage."
Wale Ogunwale [Thu, 19 Nov 2015 03:22:49 +0000 (19:22 -0800)]
Fix build breakage.
Change-Id: Ie60b148d61d746de354b12852d4a6db2d82121c5
Diego Perez [Thu, 19 Nov 2015 03:19:00 +0000 (03:19 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am:
603544d4c4 am:
14a826380d am:
0b76d094c6
am:
f9281b6dfe
* commit '
f9281b6dfe94f1df0fac3ddbad846012b0a6fb7d':
Fix delegation of methods within inner static classes
Joe LaPenna [Thu, 19 Nov 2015 03:17:33 +0000 (03:17 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off." am:
f2b9b2d85a am:
f7aceb60e3 am:
2900dc2349 am:
617bd39465
am:
01186abc81
* commit '
01186abc81c721c84a5d588bb7183d811d77f99c':
Revert "Don't dispatch when non-interactive and the display is off."
Michael Wright [Thu, 19 Nov 2015 03:16:03 +0000 (03:16 +0000)]
Deepanshu Gupta [Thu, 19 Nov 2015 03:14:35 +0000 (03:14 +0000)]
Revert "LayoutLib: Fix true transparency in status bar." am:
4ea74d2960 am:
d67897e4fb am:
6058efff69
am:
00a3f4b32e
* commit '
00a3f4b32e321dbe8320e6cb9d9a90f5699b244f':
Deepanshu Gupta [Thu, 19 Nov 2015 03:13:06 +0000 (03:13 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am:
42a893b50b am:
ef4050128a am:
0a9b4e5f00
am:
cd8e8ea0eb
* commit '
cd8e8ea0ebc61d13a66c5abcc1d359a24c152f31':
Deepanshu Gupta [Thu, 19 Nov 2015 03:11:48 +0000 (03:11 +0000)]
Michael Wright [Thu, 19 Nov 2015 03:10:13 +0000 (03:10 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0 am:
c73255d8ab am:
053f241cc7 am:
e2af036719 am:
cd00ba1a71
am:
1c996ff5b4 -s ours
* commit '
1c996ff5b49d2dcfd3d9c50e41006fb70ea01947':
Bryce Lee [Thu, 19 Nov 2015 03:08:54 +0000 (03:08 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3 am:
e2861471b9 am:
52d93db91d
am:
20ef5a3f44
* commit '
20ef5a3f44cb544ed525451bd306fa676e39a7a5':
Joe LaPenna [Thu, 19 Nov 2015 03:07:32 +0000 (03:07 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours am:
dbe1804f58 -s ours am:
9cb81aa210 -s ours
am:
5431e73f14 -s ours
* commit '
5431e73f147ca776cbab800c9cac26fd1653e925':
Sanket Padawe [Thu, 19 Nov 2015 03:06:10 +0000 (03:06 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae am:
63e6aa8571 am:
32a190bd78 am:
7bb34d7517 am:
fc8f7cee01
am:
0106bef2fa
* commit '
0106bef2facf448e674c9795e6c38aaad0e232e7':
Deepanshu Gupta [Thu, 19 Nov 2015 03:04:49 +0000 (03:04 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a am:
80bd5e6fd7 am:
9f275ec3fd
am:
da5929914b
* commit '
da5929914b618678f462c1a24ee042ff25001a0c':
Michael Kwan [Thu, 19 Nov 2015 03:03:18 +0000 (03:03 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours am:
b0aae584ea -s ours am:
2c8f3734af -s ours
am:
4cb17f362e -s ours
* commit '
4cb17f362e60741c77d9cf56de95a44df0bec648':
Qiwen Zhao [Thu, 19 Nov 2015 02:51:40 +0000 (02:51 +0000)]
Merge "resolve merge conflicts of
7d1428d7f3 to "
Sandra Kwan [Wed, 4 Nov 2015 19:19:47 +0000 (11:19 -0800)]
AccountManager: add startAddAccount API.
Adding startAddAccount API to AccountManager and
AbstractAccountAuthenticator.
Change-Id: I29e1defb2181ece1281534db0e36b28457085148
Wale Ogunwale [Thu, 19 Nov 2015 02:10:32 +0000 (02:10 +0000)]
Merge "Allow apps to set launch bounds for activities."
Wale Ogunwale [Wed, 18 Nov 2015 23:56:57 +0000 (15:56 -0800)]
Allow apps to set launch bounds for activities.
unhide ActivityOptions APIs for setting launch bounds for
an activitiy so apps can use it. Only works on devices that
support PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT.
Bug:
25499677
Change-Id: I75424681f25cbb9fe92f2ed73e6afbab765dab29
Dianne Hackborn [Wed, 18 Nov 2015 22:52:04 +0000 (14:52 -0800)]
Implement flexible light idle maintenance windows.
For light idle mode, our maintenance window is pretty short (1 minute).
Usually we have nothing to do in it... but sometimes we may want to
do a sync or download that takes more than a minute, and it would be
nice to not take the overhead of breaking that up in to multiple
windows.
So now we have a flexibile window, from 1 minute to 5 minutes. We
start out with 1 minute, and any window that uses less than 1
minute increases the available window by that amount for later use.
If we later use more than 1 minute, we correspondingly decrease
the next available window.
Change-Id: Ie273dbd5843b3aa4a3d5d9b2e420cda75517340f
Suprabh Shukla [Thu, 19 Nov 2015 00:53:20 +0000 (00:53 +0000)]
Merge "Moving recent tasks information to a user directory"
Dianne Hackborn [Thu, 19 Nov 2015 00:29:56 +0000 (16:29 -0800)]
Move appops command to the service.
The "appops" shell command is now just a wrapper around doing
"cmd appops", no more need to launch a Java VM!
Change-Id: I06fc68762d0ab95a016fb24db0affb0d91197588
Philip P. Moltmann [Thu, 19 Nov 2015 00:23:03 +0000 (16:23 -0800)]
Do not restart printSpooler when switching portait mode / landscape mode
When the configration changes there are two modes to handle it:
1. do through a onDestroy - onCreate cycle
2. declare that your activity can handle certain changed and handle them
in onConfigurationChanges
For most apps (1) is zero effort to implement, hence it is the default
behavior. You only want to do (2) if recreating your activity is
expensive.
As recreating the printActivity is expensive (and currently even
impossible) we want to handle the configuration change gracefully. There
is no code to be added as handling portrait mode / landscape mode switch
is not different from an orientation switch.
Bug:
25727559
Change-Id: Iac5b854c9dd080a4432957bc4551162dc3d480e9
Yohei Yukawa [Wed, 18 Nov 2015 21:44:14 +0000 (13:44 -0800)]
Have ControlledInputConnectionWrapper#toString().
'dumpsys input_method' does not generate useful information for
InputMethodManager#mIInputContext. It is currently just a default
output of Object#toString().
This CL overrides ControlledInputConnectionWrapper#toString() so that
we can easily understand whether this connection is accepting API calls
from the IME or silently droping those API calls. Note that
ControlledInputConnectionWrapper is not exposed to developers so
overriding #toString() has no effect for application developers.
Bug:
25373872
Change-Id: I89b9d4e15bc1569817bab4d1be429ac6e0462f14
George Mount [Wed, 18 Nov 2015 23:51:52 +0000 (23:51 +0000)]
Merge "Fix leak of Bundled data."
Todd Kennedy [Wed, 18 Nov 2015 23:38:28 +0000 (15:38 -0800)]
resolve merge conflicts of
7d1428d7f3 to master.
Change-Id: If6455063e7b47ad503d8ec15a8f1d2477065d6e8
Felipe Leme [Wed, 18 Nov 2015 23:04:13 +0000 (15:04 -0800)]
Fixed typos.
Change-Id: I13f2a0cd9b5e41a6af27fbbc6f33ecc0241b3c29
George Mount [Wed, 18 Nov 2015 19:10:55 +0000 (11:10 -0800)]
Fix leak of Bundled data.
Bug
25776890
Change-Id: Ib67c71e2fa01c902ad2b18f46bcaad73a73955ad
Wale Ogunwale [Wed, 18 Nov 2015 22:53:03 +0000 (22:53 +0000)]
Merge changes I6b641d6b,Id573a309
* changes:
Renamed NonClientDecorView to DecorCaptionView
Control display of shadows for multi-window in DecorView
Chris Craik [Wed, 18 Nov 2015 22:50:54 +0000 (22:50 +0000)]
Merge "Fix layer create properties"
Doris Liu [Wed, 18 Nov 2015 22:44:44 +0000 (22:44 +0000)]
Merge "VectorDrawable native rendering - Step 2 of MANY"
Chris Craik [Wed, 18 Nov 2015 22:42:00 +0000 (14:42 -0800)]
Fix layer create properties
bug:
25753159
Change-Id: Ifa64dbfd8057ae5b390ba0c177627a5325cdd769
Xiaohui Chen [Wed, 18 Nov 2015 22:13:47 +0000 (22:13 +0000)]
Merge "cmds: fix settings command help msg"
Xiaohui Chen [Wed, 18 Nov 2015 22:10:42 +0000 (14:10 -0800)]
cmds: fix settings command help msg
There is a missing white space.
Change-Id: I7e7f4783464a7be02a3b2e1a30a629ed1ebdc913
Julia Reynolds [Wed, 18 Nov 2015 22:03:56 +0000 (17:03 -0500)]
Remove 'peekable' preference.
To be replaced by 'importance' in the future.
Bug:
22854014
Change-Id: Idc9ca79b145d5c69e769c9239ed9291dce40d8c8
Xiaohui Chen [Wed, 18 Nov 2015 21:53:15 +0000 (21:53 +0000)]
Merge "Skip dead users when getting primary."
Doris Liu [Tue, 17 Nov 2015 06:48:34 +0000 (22:48 -0800)]
VectorDrawable native rendering - Step 2 of MANY
Introduced PathData in Java, which is effectively a thin layer around the
native instance. PathData holds the verbs and points which is being used
in path morphing/interpolation. The verbs and points can be interpreted
into skia path commands, which is now done in native and therefore saves
a handful of JNI calls during path creation.
Removed the old PathDataNode mechanism and changed the PathEvaluator
to use PathData instead.
Also added tests and a microbench. Also ran CTS tests for VectorDrawable
and AnimatedVectorDrawable, and passed all of the existing tests.
Change-Id: Ia166f5172ff031fe18b154327967f911a62caec1
Xiaohui Chen [Wed, 18 Nov 2015 21:37:32 +0000 (13:37 -0800)]
Skip dead users when getting primary.
Bug:
25769085
Change-Id: I220d175839509e4dbf3f2992a90e9625d0caf825
Ben Kwa [Wed, 18 Nov 2015 21:15:37 +0000 (21:15 +0000)]
Merge "Open the destination dir when a copy notification is tapped."
Aurimas Liutikas [Wed, 18 Nov 2015 21:06:14 +0000 (21:06 +0000)]
Merge "Start saving CheckedTextView checked state."
Vladislav Kaznacheev [Wed, 18 Nov 2015 20:55:35 +0000 (20:55 +0000)]
Merge "Fix broken build"
Vladislav Kaznacheev [Wed, 18 Nov 2015 20:53:45 +0000 (12:53 -0800)]
Fix broken build
Followup to ag/808050
Change-Id: I9912eae6a8c09b90685e19b3a9080b2d557c857b
Felipe Leme [Wed, 18 Nov 2015 20:41:53 +0000 (20:41 +0000)]
Merge "Improves how cornercase scenarios are handled:"
Amith Yamasani [Wed, 18 Nov 2015 20:27:43 +0000 (20:27 +0000)]
Merge "Fix crash in bindService due to uncleared binder identity"
Wale Ogunwale [Wed, 18 Nov 2015 19:44:10 +0000 (11:44 -0800)]
Renamed NonClientDecorView to DecorCaptionView
DecorCaptionView better describes what it does now which is to
display the caption area and control buttons within it.
Change-Id: I6b641d6b117bb8f03656bff93702fc093160851d
Ben Kwa [Fri, 25 Sep 2015 21:48:29 +0000 (14:48 -0700)]
Open the destination dir when a copy notification is tapped.
- Cleanup: rename the "open copy destination" action to "pick copy
destination", which better reflects what it does.
- Move DocumentsIntent from BaseActivity to Shared.
- Rename ACTION_BROWSE_DOCUMENT_ROOT to ACTION_BROWSE for general browsing.
- Use the new ACTION_BROWSE to open the copy destination when copy
notifications are tapped.
BUG=
23137963
Change-Id: I10480b45a16ce716febac5453cb5015d26bb0062
Vladislav Kaznacheev [Wed, 18 Nov 2015 19:13:13 +0000 (19:13 +0000)]
Merge "Implement View.cancelDrag"
Dianne Hackborn [Wed, 18 Nov 2015 19:07:43 +0000 (19:07 +0000)]
Merge "Fix issue #
25673462: Shamu update from MMB29J -> 29K does not complete"
Amith Yamasani [Wed, 18 Nov 2015 18:56:04 +0000 (10:56 -0800)]
Fix crash in bindService due to uncleared binder identity
Clear the calling identity in retrieveServiceLocked before
doing the appop check. It probably needs to be cleared sooner
in general in retrieveServiceLocked(), but that might be a risky
fix. Making this smaller fix to keep it surgical for now.
Bug:
25759739
Change-Id: I66a5f8ef9b2d914181925fa344c3f2962030583d
Doris Liu [Wed, 18 Nov 2015 18:53:49 +0000 (18:53 +0000)]
Merge "Fix crash on second screenshot."
Felipe Leme [Wed, 18 Nov 2015 18:26:10 +0000 (10:26 -0800)]
Improves how cornercase scenarios are handled:
- Bug reports without screenshots are supported.
- Shows a toast message when the bugreport file cannot be read.
BUG:
25751868
Change-Id: I4ed2c47a89b373cf878720ebcba90c96bd51342b
Wale Ogunwale [Wed, 18 Nov 2015 18:33:22 +0000 (10:33 -0800)]
Control display of shadows for multi-window in DecorView
Allows us to display shadows without needing the NonClientDecorView.
For example, windows in pinned stack don't have a NonClientDecorView.
Bug:
25006507
Change-Id: Id573a30942a9bfcd002b86f0956d0b2a14ec2c2b
Siyamed Sinir [Wed, 18 Nov 2015 18:32:22 +0000 (18:32 +0000)]
Merge "TextView setText/append methods set movement method"
Yohei Yukawa [Wed, 18 Nov 2015 18:15:18 +0000 (18:15 +0000)]
Merge "Tell the reason why IMMS unbinds IME client."
Andreas Gampe [Wed, 18 Nov 2015 18:11:11 +0000 (18:11 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive" am:
b61d3dd8a7
am:
a7e9f174c1
* commit '
a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
Frameworks/base: Make RuntimeAbort more expressive
Andreas Gampe [Wed, 18 Nov 2015 17:47:52 +0000 (17:47 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
am:
b61d3dd8a7
* commit '
b61d3dd8a773be393c738675cff28fc799497535':
Frameworks/base: Make RuntimeAbort more expressive
Nicolas Geoffray [Wed, 18 Nov 2015 17:21:41 +0000 (17:21 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
cf49583bd0
am:
5485d81578
* commit '
5485d815788e4037829d70d041fe4fc1a35416f3':
Remove DEBUG_JIT from Zygote flags.
Filip Gruszczynski [Wed, 18 Nov 2015 17:21:38 +0000 (17:21 +0000)]
Merge "Make recents visible on resume unless requested otherwise."
Andreas Gampe [Wed, 18 Nov 2015 17:16:59 +0000 (17:16 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
Filip Gruszczynski [Wed, 18 Nov 2015 17:04:13 +0000 (17:04 +0000)]
Merge "Swtich from max_action_buttons resource to a method."
Filip Gruszczynski [Wed, 18 Nov 2015 16:58:34 +0000 (08:58 -0800)]
Make recents visible on resume unless requested otherwise.
If the last interaction left recents invisible, we need to make the
visible again on their next resume.
Bug:
25754031
Change-Id: I4b1d4bae5609bf3f4a77250d3544084afd594536
Tony Mantler [Wed, 18 Nov 2015 16:47:41 +0000 (16:47 +0000)]
Merge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"
Julia Reynolds [Wed, 18 Nov 2015 16:43:54 +0000 (16:43 +0000)]
Merge "Cache notifications less aggressively."
Julia Reynolds [Wed, 18 Nov 2015 16:37:59 +0000 (16:37 +0000)]
Merge "Don't recreate remote views that already exist."
Julia Reynolds [Wed, 18 Nov 2015 16:12:53 +0000 (11:12 -0500)]
Cache notifications less aggressively.
Bug:
25694023
Change-Id: Ie8f1b518fdcb72cfbd982908aa30cdb8ebbb2f02
Jason Monk [Wed, 18 Nov 2015 15:41:27 +0000 (15:41 +0000)]
Merge "Fix build"
Jason Monk [Wed, 18 Nov 2015 15:40:34 +0000 (10:40 -0500)]
Fix build
Change-Id: Ib784f3b8e1f8e5166128a86d07b43859ee803765
George Mount [Wed, 18 Nov 2015 15:37:39 +0000 (15:37 +0000)]
Merge "Properly remove GhostViews when Activity Transition canceled."
Jason Monk [Wed, 18 Nov 2015 15:08:02 +0000 (15:08 +0000)]
Merge "Move some stuff to SettingsLib to use for Settings Home"
Jason Monk [Mon, 16 Nov 2015 20:59:53 +0000 (15:59 -0500)]
Move some stuff to SettingsLib to use for Settings Home
Change-Id: Id903747069fe83a896132714e580b1a1d7ee895c