OSDN Git Service
Clara Bayarri [Sat, 18 Apr 2015 07:11:20 +0000 (07:11 +0000)]
Merge "Enable Text Selection Action Mode for seach boxes and action bar components."
Geoff Mendal [Sat, 18 Apr 2015 05:31:16 +0000 (05:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 18 Apr 2015 05:29:38 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40b8fb51ad997a3c5a7a14eb51cc5025b6c52b34
Auto-generated-cl: translation import
Geoff Mendal [Sat, 18 Apr 2015 04:04:07 +0000 (04:04 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 18 Apr 2015 04:00:43 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0558ebee84c3b599dce7f50583753724e0e396b1
Auto-generated-cl: translation import
Geoff Mendal [Sat, 18 Apr 2015 03:42:17 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 18 Apr 2015 03:39:13 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I30e078fe1a9ea0fe645597d9dc93172f301322e9
Auto-generated-cl: translation import
Geoff Mendal [Sat, 18 Apr 2015 03:22:14 +0000 (20:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7a0cfd12e5ed935ad521bd48eb82dd6cad3084f
Auto-generated-cl: translation import
Robert Shih [Sat, 18 Apr 2015 02:50:11 +0000 (02:50 +0000)]
Merge "MediaPlayer: initial timed id3 support"
Robert Shih [Fri, 10 Apr 2015 18:15:02 +0000 (11:15 -0700)]
MediaPlayer: initial timed id3 support
Change-Id: Ibf2ea8fa1b44f2953bda49cdc6da979c2d3f6be2
Amith Yamasani [Sat, 18 Apr 2015 02:01:17 +0000 (02:01 +0000)]
Merge "Add isSystemUser API"
P.Y. Laligand [Sat, 18 Apr 2015 01:56:42 +0000 (01:56 +0000)]
Merge "Consistent null-checking in MediaRouter."
Amith Yamasani [Sat, 18 Apr 2015 01:42:41 +0000 (18:42 -0700)]
Add isSystemUser API
Bug:
20348316
Bug:
19945747
Change-Id: Ibb81f0b2fccec621e26e4543bf9f26ffddfafb15
Jeff Sharkey [Sat, 18 Apr 2015 01:12:24 +0000 (01:12 +0000)]
Merge "Volumes know parent disks; unsupported disks."
Jeff Sharkey [Sat, 18 Apr 2015 00:35:07 +0000 (17:35 -0700)]
Volumes know parent disks; unsupported disks.
This is cleaner and more direct than the reverse of having the disk
publish child volume membership. Rename state constants to match
public API. Add state representing bad removal. Make it clear that
volume flags are related to mounting.
Send new unsupported disk event when we finish scanning an entire
disk and have no meaningful volumes.
Splice disk labels into description when known. Only adoptable
slots are directly visible to apps.
Bug:
19993667
Change-Id: I12fda95be0d82781f70c3d85c039749052dc936b
Svetoslav [Thu, 16 Apr 2015 23:19:24 +0000 (16:19 -0700)]
Remove unnecessary WRITE_SMS permission - framework
Currently only one app can write to the SMS provider and it has to
be set as the default SMS app by the user in the UI. The default
SMS app is set by enabling the write SMS app op for it and keeping
this op off for other SMS apps. Hence, this permission does not
guard anything and can be taken out. The API change is fine as if
an app refers to the permission in the manifest as string it will
be ignored and if it was referred in Java the value is statically
compiled in the source.
Change-Id: I1128c3b034e6c7dda4baa051500ac1ef46a53575
Sean Wan [Sat, 18 Apr 2015 00:17:03 +0000 (00:17 +0000)]
am
527b1d3a: (-s ours) am
d1a72651: am
b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
* commit '
527b1d3a06a6665006406a4239a58035642bc418':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Svetoslav [Sat, 18 Apr 2015 00:16:28 +0000 (00:16 +0000)]
Merge "Teach telephony about location app ops"
Doris Liu [Sat, 18 Apr 2015 00:14:37 +0000 (00:14 +0000)]
Merge "Revert "Use real screen size to scale duration""
Doris Liu [Sat, 18 Apr 2015 00:14:14 +0000 (00:14 +0000)]
Revert "Use real screen size to scale duration"
This reverts commit
5ed54c743c04e2bc349e12c31adb67cbc3094651.
Reverting to avoid build breakage.
Change-Id: Ib73056bb5a11e718cbc82db5917946bdf8db06dc
Sean Wan [Sat, 18 Apr 2015 00:04:38 +0000 (00:04 +0000)]
am
d1a72651: am
b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
* commit '
d1a72651ed723b8e89875cdd7e0429f1c35ca8c2':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Svetoslav [Tue, 14 Apr 2015 21:32:25 +0000 (14:32 -0700)]
Teach telephony about location app ops
Change-Id: I2bd8f0cb90d161994045d403f5d0c129ea951c3f
Sean Wan [Fri, 17 Apr 2015 23:55:21 +0000 (23:55 +0000)]
am
b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
* commit '
b792f43301c61cce996dd5bac4589b4720a37bec':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Sean Wan [Fri, 17 Apr 2015 23:45:37 +0000 (23:45 +0000)]
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
Doris Liu [Fri, 17 Apr 2015 23:40:47 +0000 (23:40 +0000)]
Merge "Use real screen size to scale duration"
Alan Viverette [Fri, 17 Apr 2015 23:40:41 +0000 (23:40 +0000)]
Merge "SeekBar track and progress should both be 2dp"
Doris Liu [Fri, 17 Apr 2015 01:36:31 +0000 (18:36 -0700)]
Use real screen size to scale duration
Duration scale based on screen size was using the area of the screen
excluding system bars to compare with our reference device's screen
size. This caused the following issues:
1) On baseline device (i.e N5) a scaling factor that is not 1 will be
applied to the duration.
2) Scaling on the same device will be different in landscape vs.
portrait, as the system bars take different amounts of space in
different orienations.
This CL fixes both of the above issues.
Bug:
20309042
Change-Id: I9d1d0a471d968bee1330b80f0f69a0066d6a1860
Sean Wan [Tue, 14 Apr 2015 21:26:40 +0000 (14:26 -0700)]
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Bug:
19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
Alan Viverette [Fri, 17 Apr 2015 22:54:22 +0000 (15:54 -0700)]
SeekBar track and progress should both be 2dp
Bug:
20341931
Change-Id: Ica3b97d6fa1c96f2215afb0199e68dfe1976109b
Svet Ganov [Fri, 17 Apr 2015 22:50:41 +0000 (22:50 +0000)]
Merge "Fix build for real"
Svet Ganov [Fri, 17 Apr 2015 22:49:53 +0000 (15:49 -0700)]
Fix build for real
Change-Id: I5742226e9b873cd5a035f11be0e228188e215365
Jeff Brown [Fri, 17 Apr 2015 22:27:02 +0000 (22:27 +0000)]
Merge "Fix leaks due to GC circular references."
Jeff Brown [Fri, 17 Apr 2015 22:22:27 +0000 (15:22 -0700)]
Fix leaks due to GC circular references.
The DisplayEventReceiver and SensorManager event queue both get
leaked when the Looper thread they are attached to dies because
the Java object holds a strong reference to its native peer and
meanwhile the native peer holds a strong reference to the Java
object through JNI.
Fixed the issue by indirecting through a weak reference as was
done for InputEventReceiver some time ago.
Bug:
12455729
Change-Id: I3d80a2a190192d1a2981bf5ae0cad30f0f7688a5
Svet Ganov [Fri, 17 Apr 2015 22:17:41 +0000 (22:17 +0000)]
Merge "Fix build"
Alan Viverette [Fri, 17 Apr 2015 22:16:07 +0000 (22:16 +0000)]
Merge "Restore windowMinWidthMajor/Minor in alert dialog overlay theme"
Svet Ganov [Fri, 17 Apr 2015 22:12:48 +0000 (15:12 -0700)]
Fix build
Change-Id: If469dce767b492c3fcc1ad8cf7ab1041eb61096f
Alan Viverette [Fri, 17 Apr 2015 21:36:51 +0000 (14:36 -0700)]
Restore windowMinWidthMajor/Minor in alert dialog overlay theme
Bug:
20185630
Change-Id: Ic4a6b3d84a24c26846ea0fcc3ce32ca882e4dd95
Svet Ganov [Fri, 17 Apr 2015 21:34:02 +0000 (21:34 +0000)]
Merge "Add OP_READ_PHONE_STATE app op - framework"
Yorke Lee [Fri, 17 Apr 2015 21:26:20 +0000 (21:26 +0000)]
Merge "Set default values for VVM constants in CarrierConfigManager"
Yorke Lee [Fri, 17 Apr 2015 20:55:56 +0000 (13:55 -0700)]
Set default values for VVM constants in CarrierConfigManager
* Also hide the constants, they don't need to be @SystemApi
* Make VVM_PORT_NUMBER an Int
Bug:
20272209
Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
John Reck [Fri, 17 Apr 2015 20:45:40 +0000 (20:45 +0000)]
Revert "A bunch more cleanups"
This reverts commit
c294d128d03bc9a9982b273a82516c04583438cc.
Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
John Reck [Fri, 17 Apr 2015 20:45:19 +0000 (20:45 +0000)]
Revert "Move AssetAtlas off of SkBitmap*"
This reverts commit
87ffb63d90fb6dd2689fe72dcb24fda9a6156220.
Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
John Reck [Fri, 17 Apr 2015 20:46:21 +0000 (20:46 +0000)]
Merge "Revert "Remove Bitmap#getSkBitmap""
John Reck [Fri, 17 Apr 2015 20:45:15 +0000 (20:45 +0000)]
Revert "Remove Bitmap#getSkBitmap"
This reverts commit
4bd981ec533a65e8dee053a0a709b484770b0a76.
Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31
Svet Ganov [Thu, 16 Apr 2015 17:32:04 +0000 (10:32 -0700)]
Add OP_READ_PHONE_STATE app op - framework
The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.
Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
Andy Hung [Fri, 17 Apr 2015 20:38:23 +0000 (20:38 +0000)]
Merge "Add non-blocking writes to AudioTrack"
Jorim Jaggi [Fri, 17 Apr 2015 20:27:20 +0000 (20:27 +0000)]
Merge "Speedup unlock when authenticating with fingerprint"
Jorim Jaggi [Thu, 16 Apr 2015 21:57:34 +0000 (14:57 -0700)]
Speedup unlock when authenticating with fingerprint
Change-Id: Ib76ff7a2a42cf6fc77848ef799c2a13b77cfebb2
Eino-Ville Talvala [Fri, 17 Apr 2015 20:22:41 +0000 (20:22 +0000)]
Merge changes from topics 'add-depth-capability', 'add-highresolution-level'
* changes:
Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
Camera: Add HIGH_RESOLUTION hardware level.
Andy Hung [Fri, 17 Apr 2015 19:51:34 +0000 (19:51 +0000)]
Merge "Add non-blocking reads to AudioRecord"
Dmitriy Ivanov [Fri, 17 Apr 2015 19:47:51 +0000 (19:47 +0000)]
am
34f0fd23: am
a04b4302: am
b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
34f0fd239c456e4e064e4c14b768962292023800':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Andres Morales [Fri, 17 Apr 2015 19:42:59 +0000 (19:42 +0000)]
Merge "Recover from dead GateKeeperService Binder"
Dmitriy Ivanov [Fri, 17 Apr 2015 19:30:56 +0000 (19:30 +0000)]
am
a04b4302: am
b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
a04b43020e1289e8b7b2501471740ace944f18d5':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dmitriy Ivanov [Fri, 17 Apr 2015 19:20:22 +0000 (19:20 +0000)]
am
b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
b0557acebc7a47f6d8a3653c376165160fc68105':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dmitriy Ivanov [Fri, 17 Apr 2015 19:01:40 +0000 (19:01 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dan Albert [Fri, 17 Apr 2015 18:50:41 +0000 (18:50 +0000)]
am
a26c8371: am
5682a23e: am
fef8bcf9: Merge "Explicitly use clang."
* commit '
a26c83718004c7640827d86b0f6a0fdf33017751':
Explicitly use clang.
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:29 +0000 (11:50 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
It is no longer needed.
Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
Dan Albert [Fri, 17 Apr 2015 18:42:44 +0000 (18:42 +0000)]
am
5682a23e: am
fef8bcf9: Merge "Explicitly use clang."
* commit '
5682a23ed41f50057887870f1aa9848b13a26190':
Explicitly use clang.
Alan Viverette [Fri, 17 Apr 2015 18:16:06 +0000 (18:16 +0000)]
Merge "Move date picker arrows out of SimpleMonthView"
Mady Mellor [Fri, 17 Apr 2015 18:14:43 +0000 (18:14 +0000)]
Merge "Drag n drop for stylus"
Dan Albert [Fri, 17 Apr 2015 18:06:54 +0000 (18:06 +0000)]
am
fef8bcf9: Merge "Explicitly use clang."
* commit '
fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
Explicitly use clang.
Selim Cinek [Fri, 17 Apr 2015 18:03:28 +0000 (18:03 +0000)]
Merge "Fixed a crash on android tv with the new heads-up manager"
Selim Cinek [Fri, 17 Apr 2015 17:39:11 +0000 (10:39 -0700)]
Fixed a crash on android tv with the new heads-up manager
Bug:
20282768
Change-Id: Ibb3dc879a2529c12f4d8ab6b031711363da93d37
Rich Slogar [Fri, 17 Apr 2015 18:01:05 +0000 (18:01 +0000)]
am
fea8ddd4: am
a9315dc1: am
c1002dfc: am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 18:00:53 +0000 (18:00 +0000)]
am
58befba6: am
124c4025: am
1252b4b8: am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
58befba6ac88b4216cac43f97a456d1119dcb972':
docs: hierarchyviewer updates
Jim Miller [Fri, 17 Apr 2015 17:57:09 +0000 (17:57 +0000)]
Merge "Clean up message dispatch in FingerprintService"
Jeff Sharkey [Fri, 17 Apr 2015 17:55:03 +0000 (17:55 +0000)]
Merge "Avoid deadlock when FSTRIM requested at boot."
Jeff Sharkey [Fri, 17 Apr 2015 17:52:51 +0000 (10:52 -0700)]
Avoid deadlock when FSTRIM requested at boot.
When PackageManager decides that FSTRIM is required at boot, we
can end up in deadlock. Work around this for now by kicking the
requested FSTRIM can down the road for a few seconds until we're
connected to vold.
Bug:
20228019
Change-Id: I47e422e618d99e59aed8a8b79227821a3012eb9f
Eino-Ville Talvala [Tue, 14 Apr 2015 00:29:52 +0000 (17:29 -0700)]
Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
- Define DEPTH_OUTPUT capability and its requirements.
- Add DEPTH_IS_EXCLUSIVE to support devices that cannot produce color and depth
for the same capture.
Change-Id: I6e511b7b8625907d9fc751fe8a73a443edeeb2ab
Eino-Ville Talvala [Tue, 14 Apr 2015 20:14:16 +0000 (13:14 -0700)]
Camera: Add HIGH_RESOLUTION hardware level.
For camera devices that support very high resolutions, add
a level that allows for those resolutions to operate at lower
capture rates, while ensuring that a reasonable resolution is
still available for high-rate capture.
Change-Id: I4a0d904504ac8a976bd02fba89b238048d55a268
Rich Slogar [Fri, 17 Apr 2015 17:49:44 +0000 (17:49 +0000)]
am
a9315dc1: am
c1002dfc: am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
a9315dc16c6b6f8d3fa79a272b0c714e8e8b2655':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:49:38 +0000 (17:49 +0000)]
am
124c4025: am
1252b4b8: am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
124c40252dcb500d4f099548088367dc15ef3152':
docs: hierarchyviewer updates
Dan Albert [Fri, 17 Apr 2015 17:43:35 +0000 (17:43 +0000)]
Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 17:40:48 +0000 (10:40 -0700)]
Explicitly use clang.
This was implicitly enabled by using ASAN.
Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
Alan Viverette [Fri, 17 Apr 2015 17:39:22 +0000 (10:39 -0700)]
Move date picker arrows out of SimpleMonthView
Also fixes incorrect docs in Drawable.
Bug:
20188255
Change-Id: I01c8563f734d9c1dad1e149bee80c651981e469f
Rich Slogar [Fri, 17 Apr 2015 17:37:51 +0000 (17:37 +0000)]
am
c1002dfc: am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
c1002dfc52ec2827d24b6c4722a47abbb99b7f16':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:37:45 +0000 (17:37 +0000)]
am
1252b4b8: am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
1252b4b8694a69150b79ecfd801ed62c6929edf3':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:27:13 +0000 (17:27 +0000)]
am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
71a616e05065e39a5a13b483b031a2040dc52eda':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:27:07 +0000 (17:27 +0000)]
am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:14:48 +0000 (17:14 +0000)]
am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
203a47395dfc17ba9e9b6b46c65bfbde002312f6':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:14:43 +0000 (17:14 +0000)]
am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
684f3aa264e678affc1b33b27602493c96ee7eac':
docs: hierarchyviewer updates
Chris Craik [Fri, 17 Apr 2015 17:08:10 +0000 (10:08 -0700)]
Hide transient view API
bug:
18621099
Change-Id: I25f64bc50bbbcf9fbbd8a4cdf81cacb61fa256f0
Rich Slogar [Fri, 17 Apr 2015 17:03:04 +0000 (17:03 +0000)]
am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:02:59 +0000 (17:02 +0000)]
am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
efe861a4a7081da795fe6a0843308ca7cef26277':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 16:53:33 +0000 (16:53 +0000)]
Merge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 16:52:44 +0000 (16:52 +0000)]
Merge "docs: hierarchyviewer updates" into lmp-docs
Wen ZHANG [Fri, 17 Apr 2015 16:41:25 +0000 (16:41 +0000)]
Merge "Set REQUIRE_PASSWORD_TO_DECRYPT to false when insecure screen lock is enabled"
Michael Wright [Fri, 17 Apr 2015 16:37:52 +0000 (16:37 +0000)]
Merge "Rename affine transformation configuration change to be consistent."
Olawale Ogunwale [Fri, 17 Apr 2015 16:36:02 +0000 (16:36 +0000)]
am
2051bded: am
53e2c6ec: am
c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit '
2051bded279f2d81e89b2a3731d1ba164ff9054a':
[ActivityManager] Fix activity always visible.
Andres Morales [Fri, 17 Apr 2015 16:15:47 +0000 (09:15 -0700)]
Recover from dead GateKeeperService Binder
Change-Id: Ie25b46225a88fd59e6426a338bb94152d2c1b302
Wale Ogunwale [Fri, 17 Apr 2015 16:28:23 +0000 (16:28 +0000)]
Merge "Fail early when starting a background user activity."
Olawale Ogunwale [Fri, 17 Apr 2015 16:23:40 +0000 (16:23 +0000)]
am
53e2c6ec: am
c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit '
53e2c6ec87e6969b5f0db2ab92a9fa133317bd29':
[ActivityManager] Fix activity always visible.
Tony Mantler [Fri, 17 Apr 2015 16:13:37 +0000 (16:13 +0000)]
Merge "Add PermissionsInfo to SettingsLib"
Olawale Ogunwale [Fri, 17 Apr 2015 16:13:03 +0000 (16:13 +0000)]
am
c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit '
c0c8d1983c5d7c9bc9469944a9d46856aff95ab9':
[ActivityManager] Fix activity always visible.
Olawale Ogunwale [Fri, 17 Apr 2015 15:50:46 +0000 (15:50 +0000)]
Merge "[ActivityManager] Fix activity always visible."
Wale Ogunwale [Thu, 16 Apr 2015 20:50:44 +0000 (13:50 -0700)]
Fail early when starting a background user activity.
If it shouldn't be displayed for all users.
Bug:
13507605
Change-Id: I8fe8e5a98759c1ca058cc7d222817f6d580ffa11
Chet Haase [Fri, 17 Apr 2015 12:34:10 +0000 (12:34 +0000)]
Merge "Add transient views to ViewGroup"
Tom Hudson [Fri, 17 Apr 2015 12:02:47 +0000 (12:02 +0000)]
Merge "Fix offset of composeLayerRegion"
Abodunrinwa Toki [Thu, 16 Apr 2015 16:27:48 +0000 (17:27 +0100)]
Change FloatingToolbar window layout type.
Floating toolbar is now rendered as TYPE_APPLICATION_ABOVE_SUB_PANEL.
This causes the FloatingToolbar to be rendered in a layer above
the text selection handles (at layer TYPE_APPLICATION_SUB_PANEL.)
Bug:
20135562
Change-Id: I1484b3493bf4cd98c679eb222270c53daa46cdf4
Martijn Coenen [Fri, 17 Apr 2015 07:47:00 +0000 (07:47 +0000)]
am
14e24b4b: am
cb477625: am
e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
* commit '
14e24b4b4495484c05f38cab1b5b3ae8443394a6':
Expose peer LLCP version in NDEF callbacks.