OSDN Git Service
Bo Liu [Mon, 24 Nov 2014 18:53:52 +0000 (10:53 -0800)]
Fix crash in getNativeCanvas when canvasHandle is NULL
BUG:
18261928
Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
Jeff Brown [Mon, 24 Nov 2014 17:34:32 +0000 (17:34 +0000)]
am
3d110b23: Make WallpaperService watch the actual display state.
* commit '
3d110b239153a6c7423a99f02ef859201205eee2':
Make WallpaperService watch the actual display state.
Sreeram Ramachandran [Mon, 24 Nov 2014 17:24:25 +0000 (17:24 +0000)]
Merge "Delete unused/non-working code." into lmp-mr1-dev
Sreeram Ramachandran [Mon, 24 Nov 2014 17:24:03 +0000 (17:24 +0000)]
Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
Sreeram Ramachandran [Mon, 24 Nov 2014 17:21:15 +0000 (17:21 +0000)]
Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
Jorim Jaggi [Mon, 24 Nov 2014 16:26:01 +0000 (16:26 +0000)]
Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:03:54 +0000 (16:03 +0000)]
Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:03:41 +0000 (16:03 +0000)]
Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:02:09 +0000 (16:02 +0000)]
Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
Christoph Studer [Mon, 24 Nov 2014 16:00:35 +0000 (16:00 +0000)]
Merge "Fix MediaStyle API comments" into lmp-mr1-dev
Chris Wren [Mon, 24 Nov 2014 15:58:14 +0000 (15:58 +0000)]
Merge "Push back notification means snooze the package." into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 15:30:47 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 15:13:23 +0000 (07:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 14:21:48 +0000 (06:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
Christoph Studer [Mon, 24 Nov 2014 13:18:06 +0000 (14:18 +0100)]
Fix MediaStyle API comments
Bug:
17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:08:17 +0000 (12:08 +0000)]
Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev
Selim Cinek [Mon, 24 Nov 2014 11:52:36 +0000 (11:52 +0000)]
Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
Wink Saville [Sat, 22 Nov 2014 20:19:23 +0000 (20:19 +0000)]
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
Wink Saville [Sat, 22 Nov 2014 18:08:16 +0000 (10:08 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
Lajos Molnar [Sat, 22 Nov 2014 05:59:29 +0000 (05:59 +0000)]
Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
Eino-Ville Talvala [Sat, 22 Nov 2014 04:57:47 +0000 (04:57 +0000)]
Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
Jeff Brown [Sat, 22 Nov 2014 03:01:13 +0000 (19:01 -0800)]
Make WallpaperService watch the actual display state.
Bug:
18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
RoboErik [Sat, 22 Nov 2014 02:28:18 +0000 (18:28 -0800)]
Fix binder equality check
Forgot to call .asBinder() before checking binders for equality. This
fixes a memory leak caused by the system holding on to binders.
bug:
18049316
Change-Id: I43a9f4163b28cf1a77e59c3e7bade32bd2ef1c1a
Joe Fernandez [Sat, 22 Nov 2014 00:25:13 +0000 (00:25 +0000)]
am
fbdfdef4: am
9034ead0: am
5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '
fbdfdef43da5d946e8559d47d8bd79db0bceedb1':
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
Scott Rowe [Sat, 22 Nov 2014 00:24:51 +0000 (00:24 +0000)]
am
63108ee3: am
02cb1fe6: am
14f78ed7: Merge "docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '
63108ee3623cc2b57c3a0a2e730dc9bf5c06c825':
docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
Sanket Padawe [Fri, 21 Nov 2014 23:33:24 +0000 (23:33 +0000)]
Merge "Make default carrier name string look better." into lmp-mr1-dev
John Reck [Fri, 21 Nov 2014 23:32:05 +0000 (23:32 +0000)]
Merge "It's super critical to call nStart" into lmp-mr1-dev
Winson Chung [Fri, 21 Nov 2014 23:15:03 +0000 (23:15 +0000)]
Merge "Reset the task stack instead of the view when Recents is hidden. (Bug.
18436876, Bug.
18394126, Bug.
18432310)" into lmp-mr1-dev
Jeff Sharkey [Fri, 21 Nov 2014 23:14:03 +0000 (23:14 +0000)]
Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev
Craig Mautner [Fri, 21 Nov 2014 22:45:07 +0000 (22:45 +0000)]
Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev
ztenghui [Fri, 21 Nov 2014 22:27:35 +0000 (22:27 +0000)]
Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev
John Reck [Fri, 21 Nov 2014 22:10:10 +0000 (14:10 -0800)]
It's super critical to call nStart
Bug:
18204974
Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set
Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished
Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
Amith Yamasani [Fri, 21 Nov 2014 22:27:16 +0000 (22:27 +0000)]
Merge "Different messages when wiping user and not device" into lmp-mr1-dev
Jeff Sharkey [Fri, 21 Nov 2014 22:13:27 +0000 (14:13 -0800)]
Avoid NPE in forceStopPackageLocked().
Bug:
18477180
Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
Chris Craik [Fri, 21 Nov 2014 22:11:11 +0000 (22:11 +0000)]
Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
Chris Craik [Fri, 21 Nov 2014 22:05:33 +0000 (22:05 +0000)]
Revert "Add a way to override Xfermode DO NOT MERGE"
Feature no longer needed.
bug:
18448377
This reverts commit
4678dcc5524258908eadc5fe1e5e1874768967eb.
Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
Winson Chung [Thu, 20 Nov 2014 01:09:03 +0000 (17:09 -0800)]
Reset the task stack instead of the view when Recents is hidden. (Bug.
18436876, Bug.
18394126, Bug.
18432310)
This will remove the need for having all the null checks in TaskStackView.
We also remove the check when launching tasks (the fail case is worse
when the activity fails to load). And the CL also fix the header focus
animation, and an issue with tasks not getting laid out when the stack is
set again.
Change-Id: I9b4cd50d76f72ba3d16dd1b8e2d9bbf9f1f24d2b
Jeff Sharkey [Fri, 21 Nov 2014 21:59:15 +0000 (21:59 +0000)]
Merge "Lightweight checkin output for network stats." into lmp-mr1-dev
Amith Yamasani [Wed, 29 Oct 2014 18:41:31 +0000 (11:41 -0700)]
Different messages when wiping user and not device
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed
Show different messages for almost wipe and wipe in each
of these 3 cases.
Bug:
16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
Jeff Brown [Fri, 21 Nov 2014 21:48:46 +0000 (21:48 +0000)]
Merge "resolved conflicts for merge of
694c1d2b to lmp-mr1-dev" into lmp-mr1-dev
Jinsuk Kim [Fri, 21 Nov 2014 21:43:20 +0000 (21:43 +0000)]
Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev
Jeff Brown [Fri, 21 Nov 2014 21:04:42 +0000 (13:04 -0800)]
resolved conflicts for merge of
694c1d2b to lmp-mr1-dev
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
Chris Wren [Thu, 20 Nov 2014 19:46:23 +0000 (14:46 -0500)]
Push back notification means snooze the package.
Bug:
18451923
Change-Id: I90160f9d14cde12a5bc03e46e64eedf770149a90
Yigit Boyar [Fri, 21 Nov 2014 20:48:44 +0000 (20:48 +0000)]
Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev
Joe Fernandez [Fri, 21 Nov 2014 20:37:02 +0000 (20:37 +0000)]
am
9034ead0: am
5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '
9034ead0ba8ce1d0c8c162d9516ca188b783d407':
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
Joe Fernandez [Fri, 21 Nov 2014 20:32:03 +0000 (20:32 +0000)]
am
5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '
5b94d00b896b2bbc71a0c925e92e8c7e08978975':
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
Joe Fernandez [Fri, 21 Nov 2014 20:23:26 +0000 (12:23 -0800)]
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
- Chinese pages are showing Japanese (not good)
- Chinese resource page is not rendering because of bad video links
Change-Id: Ia4508c2db85b9cbd5bdad34ae8bedc411df98360
ztenghui [Fri, 21 Nov 2014 19:32:29 +0000 (11:32 -0800)]
Supporrt tapas build for vector tests
Such that UX team has less pain on building the VD / AVD assets.
This also requires removing internal API dependence in the test.
To build the VectorDrawableTest with prebuilt SDK.
<root dir>/tapas VectorDrawableTest
<root dir>/make -j64 showcommand
Then later for incremental build.
<root dir>/mmm ./frameworks/base/tests/VectorDrawableTest/ -j20
b/
18260896
Change-Id: Id559074df78d7c2a5c529c545834da23986bc15f
Jinsuk Kim [Fri, 21 Nov 2014 01:43:51 +0000 (10:43 +0900)]
CEC: Enable log for non-user builds
This helps get better bugreports for dogfooding. Accompanying bug
will be kept track of to ensure the log is turned off before
shipping. See ag/175890 for reference.
Bug:
18471978
Change-Id: Ic67d64526fee3c52fee6c7f1e0201ead4ae6a3e7
Bryce Lee [Fri, 21 Nov 2014 19:18:47 +0000 (19:18 +0000)]
Merge "Make default windows features configurable." into lmp-mr1-dev
Bryce Lee [Fri, 21 Nov 2014 19:08:45 +0000 (11:08 -0800)]
Make default windows features configurable.
Bug:
18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
Jim Miller [Fri, 21 Nov 2014 18:37:59 +0000 (18:37 +0000)]
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
Jeff Sharkey [Wed, 19 Nov 2014 02:22:21 +0000 (18:22 -0800)]
Lightweight checkin output for network stats.
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag. Defaults to last 24 hours,
but included data can be tweaked with various flags.
Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."
Bug:
18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
Adrian Roos [Fri, 21 Nov 2014 17:56:59 +0000 (17:56 +0000)]
Merge "Explicitly specify user for public mode" into lmp-mr1-dev
Rubin Xu [Fri, 21 Nov 2014 17:50:20 +0000 (17:50 +0000)]
Merge "String literals for CL ag/586597" into lmp-mr1-dev
Scott Rowe [Fri, 21 Nov 2014 17:50:17 +0000 (17:50 +0000)]
am
02cb1fe6: am
14f78ed7: Merge "docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '
02cb1fe6c4a12c15ef44c2982fcab71ba6346c9b':
docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
Ruben Brunk [Fri, 21 Nov 2014 17:42:42 +0000 (17:42 +0000)]
Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
Scott Rowe [Fri, 21 Nov 2014 17:41:06 +0000 (17:41 +0000)]
am
14f78ed7: Merge "docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '
14f78ed7b8c374017fa37f29cfed2208a072ea28':
docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
Scott Rowe [Fri, 21 Nov 2014 17:34:27 +0000 (17:34 +0000)]
Merge "docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
Sreeram Ramachandran [Wed, 12 Nov 2014 00:09:21 +0000 (16:09 -0800)]
Allow VPNs to specify their underlying networks.
These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.
Bug:
17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24
Selim Cinek [Fri, 21 Nov 2014 16:44:34 +0000 (17:44 +0100)]
Fixed several time related states for secondary users
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.
Bug:
16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
Rubin Xu [Thu, 20 Nov 2014 23:59:51 +0000 (23:59 +0000)]
String literals for CL ag/586597
Mini-CL to get the strings in for translations.
Bug:
17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
Sreeram Ramachandran [Wed, 19 Nov 2014 17:09:43 +0000 (09:09 -0800)]
Delete unused/non-working code.
Change-Id: I2cba9ffdb4ed547cb922d0ac08abf81e49ffa66b
Sreeram Ramachandran [Thu, 13 Nov 2014 06:31:52 +0000 (22:31 -0800)]
Eliminate race conditions in UID-based network filtering.
The previous code retrieved information from the legacy tracker multiple
times for each user query, leading to race conditions where the info
could've changed between the calls.
Refactors the handling of legacy data types in ConnectivityService and
unifies call paths so that APIs that deal with legacy data types
(NetworkInfo and int/networkType) and newer types (such as Network) go
through common code paths, using NetworkState to hold all the necessary
data pieces. This enables follow-on bug fixes to getActiveNetworkInfo().
The changes are limited to public "query" APIs (those that retrieve some
network information or the other). More details about the specific
changes and their rationale can be found in the code review thread.
Bug:
17460017
Change-Id: I656ee7eddf2b8cace5627036452bb5748043406c
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:21:03 +0000 (15:21 +0000)]
Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:20:44 +0000 (15:20 +0000)]
Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev
Adrian Roos [Fri, 21 Nov 2014 14:27:12 +0000 (15:27 +0100)]
Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
Fix log spam and wrong log string.
Bug:
18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380
Adrian Roos [Fri, 21 Nov 2014 13:54:04 +0000 (13:54 +0000)]
Revert "Only keep user switcher bitmaps if needed"
This reverts commit
cba0faadbe1c8cf7c6b264b761d747f7381a2f93
with change id I416beb82156787e61ee1f59b6726fd702f135f68.
It keeps the fix preventing us from reclipping already loaded
bitmaps.
Bug:
18350670
Change-Id: I0562d38d2a6eb0b715adcd4ca77512f2cbedd320
Adrian Roos [Fri, 21 Nov 2014 12:55:09 +0000 (13:55 +0100)]
Explicitly specify user for public mode
Bug:
18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
Paul Jensen [Fri, 21 Nov 2014 12:42:32 +0000 (12:42 +0000)]
Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev
Adrian Roos [Thu, 20 Nov 2014 22:55:34 +0000 (23:55 +0100)]
Fix DPM.resetPassword("")
While we're at it, also fix some multi-user issues in
LockPatternUtils.
Bug:
17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
Geoffrey Borggaard [Fri, 21 Nov 2014 10:17:39 +0000 (10:17 +0000)]
am
c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
automerge:
90ed95f
* commit '
90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
Fix null handling in proxies.
Ricardo Cervera [Fri, 21 Nov 2014 10:16:35 +0000 (10:16 +0000)]
am
e9b5dfc0: am
25bf00bc: docs: Fixes to the Data Layer Wear class.
automerge:
8837ce2
* commit '
8837ce2ce3b8e10a5201a18b77a790d0df43d8e4':
docs: Fixes to the Data Layer Wear class.
Ricardo Cervera [Fri, 21 Nov 2014 10:15:17 +0000 (10:15 +0000)]
am
c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev
automerge:
161dce4
* commit '
161dce465ef528568eac119235e635b217322485':
docs: Fixes to the Data Layer Wear class.
Filip Gruszczynski [Fri, 21 Nov 2014 10:13:59 +0000 (10:13 +0000)]
Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
automerge:
96c5d37
* commit '
96c5d37fb5139465cdd3d882b5deba830497557a':
SwipeDismissLayout makes activity opaque only after entry animation ends.
Andrew Solovay [Fri, 21 Nov 2014 10:12:52 +0000 (10:12 +0000)]
am
c79173c7: am
05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs
automerge:
b5b9c9b
* commit '
b5b9c9b589c058d9e21ca23976d7574f9c604e38':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
Elliott Hughes [Fri, 21 Nov 2014 10:11:34 +0000 (10:11 +0000)]
am
03c80408: am
6c43e6b5: Fix and be more explicit about plurals best practices.
automerge:
4db3fc1
* commit '
4db3fc1c28d3894aed92c5aae40f25e713a69894':
Fix and be more explicit about plurals best practices.
Dirk Dougherty [Fri, 21 Nov 2014 10:10:32 +0000 (10:10 +0000)]
am
ef629f1f: am
a79acc03: Doc change: localized content.
automerge:
4d82f8a
* commit '
4d82f8ad32f9caa3aff237600c4693f8907009e9':
Doc change: localized content.
smain@google.com [Fri, 21 Nov 2014 10:09:15 +0000 (10:09 +0000)]
am
555d6e70: am
2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
automerge:
6e08d30
* commit '
6e08d30da4db5fc8a433b93f16ada2bcf6d1a5cd':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
Quddus Chong [Fri, 21 Nov 2014 10:08:07 +0000 (10:08 +0000)]
am
8428c114: am
9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc.
automerge:
a1e1890
* commit '
a1e18907975436803bc13a65ec25f30b6606379e':
docs: Added link to CarExtender class from Auto Getting Started doc.
Deepanshu Gupta [Fri, 21 Nov 2014 10:06:59 +0000 (10:06 +0000)]
am
4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev
automerge:
ddc83df
* commit '
ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
Fix setTextAppearance for styles with dots.
Deepanshu Gupta [Fri, 21 Nov 2014 10:05:07 +0000 (10:05 +0000)]
am
455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
automerge:
a0bc2e7 -s ours
* commit '
a0bc2e7e3c2f075a23449df00659c96d0cddb417':
LayoutLib: Stub AM/PM keycodes in Time Picker.
John Spurlock [Fri, 21 Nov 2014 03:36:38 +0000 (03:36 +0000)]
Merge "Doze: Make proximity check configurable." into lmp-mr1-dev
John Spurlock [Fri, 21 Nov 2014 02:48:09 +0000 (21:48 -0500)]
Doze: Make proximity check configurable.
Default to true, but make it available for overlay or setting
at runtime.
Bug:
18373928
Change-Id: I6abc1924ea0f03620f4683dc055f64ede5782809
Christopher Tate [Fri, 21 Nov 2014 02:24:30 +0000 (02:24 +0000)]
Merge "Recents backup helper" into lmp-mr1-dev
Alan Viverette [Fri, 21 Nov 2014 02:12:09 +0000 (02:12 +0000)]
Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
Alan Viverette [Fri, 21 Nov 2014 01:50:37 +0000 (01:50 +0000)]
Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev
Dianne Hackborn [Fri, 21 Nov 2014 01:31:09 +0000 (01:31 +0000)]
Merge "Fix issue #
15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev
Dianne Hackborn [Fri, 21 Nov 2014 01:17:39 +0000 (17:17 -0800)]
Fix issue #
15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
You now need to set a flag if you want this unsafe behavior.
Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
Alan Viverette [Fri, 21 Nov 2014 01:09:27 +0000 (17:09 -0800)]
Update overflow menu alignment to match spec
BUG:
18417348
Change-Id: I5e4b1ca366c554bca33eac8e5403be6de72370f9
Jeff Brown [Fri, 21 Nov 2014 00:54:03 +0000 (00:54 +0000)]
Merge "Support keeping activities resumed while dozing." into lmp-sprout-dev
Jeff Brown [Thu, 20 Nov 2014 02:30:58 +0000 (18:30 -0800)]
Support keeping activities resumed while dozing.
If the lock screen is not shown, then let activities keep running
while dozing. This is important to support ambient mode on watches
since it allows the home app to keep running.
To make this possible, we need to inform the activity manager about
the exact wakefulness state, not just the overall boolean
interactive state.
Bug:
18284212
Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
Geoffrey Borggaard [Fri, 21 Nov 2014 00:35:05 +0000 (00:35 +0000)]
Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge:
e4590cf
automerge:
db1e7fa
* commit '
db1e7fa097972d4cc26447f46abd8d4367d44eb7':
Setting ADB_ENABLED may result in a SecurityException.
Lajos Molnar [Fri, 21 Nov 2014 00:16:55 +0000 (16:16 -0800)]
media: fix isSupportedFormat for integer frame rate
Bug:
18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
Alan Viverette [Fri, 21 Nov 2014 00:08:23 +0000 (00:08 +0000)]
Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev
Alan Viverette [Fri, 21 Nov 2014 00:07:59 +0000 (16:07 -0800)]
Update scrollbars to match Material spec
Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.
BUG:
18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
Erik Kline [Fri, 21 Nov 2014 00:04:20 +0000 (00:04 +0000)]
Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev
John Reck [Fri, 21 Nov 2014 00:00:06 +0000 (00:00 +0000)]
Merge "If the surface is lost, release it" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 20 Nov 2014 22:36:26 +0000 (14:36 -0800)]
Camera: Add new capability flags as system features as well
Also add all the L and L MR1 new system features to the uses-feature documentation.
Bug:
18281970
Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
John Reck [Thu, 20 Nov 2014 23:26:06 +0000 (23:26 +0000)]
Merge "Rename callDrawGLFunction" into lmp-mr1-dev