OSDN Git Service
Selim Cinek [Tue, 26 Jan 2016 23:45:03 +0000 (23:45 +0000)]
Merge changes from topic 'fullbleed'
* changes:
Added bigger notification paddings above and below groups
Replacing alpha with shadowAlpha
Fixed the divider height to be at least 1px high
Added transparency to the notification backgrounds on the lockscreen
Animating background of the notifications now
Drawing the background of the notifications as a grey color now
Refactored the interpolators to use only one single instance
Removed the visual speedbump
Remove the scale animation from the lockscreen
Removed notification top padding
Removed round rect clipping for notifications and qs
Removed notification side paddings
Selim Cinek [Mon, 25 Jan 2016 23:54:10 +0000 (15:54 -0800)]
Added bigger notification paddings above and below groups
Bug:
24866646
Change-Id: I0bca7a1abcbc0fa816aeed5729e650de24f523f0
Selim Cinek [Fri, 22 Jan 2016 20:12:37 +0000 (12:12 -0800)]
Replacing alpha with shadowAlpha
Change-Id: I1fc75e395321d77fb959dd3e8ce520bd8378cfeb
Selim Cinek [Fri, 22 Jan 2016 00:16:41 +0000 (16:16 -0800)]
Fixed the divider height to be at least 1px high
Also adapted the children divider to be consistent
Change-Id: I158167f70e9e0bc9e251785078a4b271720919c5
Selim Cinek [Thu, 21 Jan 2016 21:20:57 +0000 (13:20 -0800)]
Added transparency to the notification backgrounds on the lockscreen
To achieve a decent lockscreen animation we also need to account for alpha.
Change-Id: Iba75f9c304962da309e0e2d32a58d757b6607b5b
Selim Cinek [Wed, 20 Jan 2016 18:54:09 +0000 (10:54 -0800)]
Animating background of the notifications now
Change-Id: Ia94e1a0ca67922e6983697dfbc68d5681de02f7e
Selim Cinek [Wed, 20 Jan 2016 01:53:12 +0000 (17:53 -0800)]
Drawing the background of the notifications as a grey color now
Some cases are still not working perfectly as the background is
never animating
Change-Id: I4b357161d53d62f4cf5c0fbf76e70e5f3465bd68
Selim Cinek [Wed, 20 Jan 2016 21:41:30 +0000 (13:41 -0800)]
Refactored the interpolators to use only one single instance
Previously many objects parsed their own interpolators leading
to memory and computational overhead.
This is now unified into a single Static class.
Change-Id: I0537aca0e6dad10a7ffd52ba64b7356b0c5e4672
Selim Cinek [Tue, 19 Jan 2016 23:16:15 +0000 (15:16 -0800)]
Removed the visual speedbump
Change-Id: Iaacfc75ba691db07522e9d1d893aecd6b3be6338
Selim Cinek [Tue, 19 Jan 2016 19:36:18 +0000 (11:36 -0800)]
Remove the scale animation from the lockscreen
With fullbleed notifications don't scale anymore when clicked.
Change-Id: I75fadb5e6ccb7f12ca8fc1cb9459c6d9576f4abd
Selim Cinek [Sat, 16 Jan 2016 02:58:39 +0000 (18:58 -0800)]
Removed notification top padding
Moving more to fullbleed
Change-Id: I28e52963315bbec37819a355dc3f198431e9daee
Selim Cinek [Sat, 16 Jan 2016 02:47:52 +0000 (18:47 -0800)]
Removed round rect clipping for notifications and qs
Change-Id: I82459dabb2b41e414d46b624eeb6dae5773acc66
Selim Cinek [Sat, 16 Jan 2016 02:24:05 +0000 (18:24 -0800)]
Removed notification side paddings
Removed all notification paddings on the side.
Bug:
24866646
Change-Id: I1a3e7b9ec5156cb953e06a83afa72c5ad36a2025
Chet Haase [Tue, 26 Jan 2016 23:29:36 +0000 (23:29 +0000)]
Merge "Fix problem with zero-duration AnimatedVectorDrawables"
Nathan Harold [Tue, 26 Jan 2016 23:25:16 +0000 (23:25 +0000)]
Merge "Make DcRtInfo Power State Constants Final" into mm-wireless-dev
am:
4269239f86
* commit '
4269239f865c55266e8ef7ef01b569c7fbfc1444':
Make DcRtInfo Power State Constants Final
Nathan Harold [Tue, 26 Jan 2016 23:19:38 +0000 (23:19 +0000)]
Merge "Make DcRtInfo Power State Constants Final" into mm-wireless-dev
Victor Chan [Tue, 26 Jan 2016 23:16:20 +0000 (23:16 +0000)]
Merge "Use vector drawables for icons on car navbar"
Eino-Ville Talvala [Tue, 26 Jan 2016 23:01:09 +0000 (23:01 +0000)]
Merge "Camera2: Add LEVEL_3 to android.info.supportedHardwareLevel"
Philip P. Moltmann [Tue, 26 Jan 2016 22:52:58 +0000 (22:52 +0000)]
Merge "Check parameters for callers of IPrintManager"
Vinit Deshpande [Tue, 26 Jan 2016 22:41:15 +0000 (22:41 +0000)]
Merge "Remove older passpoint code that we never made to work" into mm-wireless-dev
am:
82c8b7edd0
* commit '
82c8b7edd0656bcab79411c8dbfe3651a314a559':
Remove older passpoint code that we never made to work
Vinit Deshpande [Tue, 26 Jan 2016 22:37:06 +0000 (22:37 +0000)]
Merge "Remove older passpoint code that we never made to work" into mm-wireless-dev
Sudheer Shanka [Fri, 22 Jan 2016 20:48:04 +0000 (20:48 +0000)]
Made checkIfkeyguardNotificationFeaturesDisabled more generic.
Currently, it can be only used for checking the status of keyguard
notification features, made it generic so that it can be used for
other keyguard features like disable_fingerprint etc.
Change-Id: Ib2adfc12d7866cce248af78cc8b159cada9a6cad
Ben Kwa [Tue, 26 Jan 2016 22:30:45 +0000 (22:30 +0000)]
Merge "Add MetricsLogger calls to DocumentsUI."
Yin-Chia Yeh [Tue, 26 Jan 2016 22:30:28 +0000 (22:30 +0000)]
Merge "Camera: codegen doc update: fix typos"
Sudheer Shanka [Tue, 26 Jan 2016 22:29:41 +0000 (22:29 +0000)]
Merge "Add util method to get the admin who set maximum time to lock."
Tyler Gunn [Tue, 26 Jan 2016 22:26:43 +0000 (22:26 +0000)]
Merge "Add capability to determine if downgrade to audio is denied."
Rakesh Iyer [Tue, 26 Jan 2016 22:25:29 +0000 (22:25 +0000)]
Merge "Fullscreen user switcher layout tweaks."
Chet Haase [Tue, 26 Jan 2016 22:21:53 +0000 (14:21 -0800)]
Fix problem with zero-duration AnimatedVectorDrawables
There was an issue with some vector drawables, particularly those with more
than one underlying, sequential animators, where the final frame would not be
drawn when battery saver mode was enabled (or animators were set to have durations
of 0). This resulted in an incorrect fingerprint graphic on the lockscreen, because
the animation effectively didn't run at all.
The fix is to always invalidate whenever the AnimatedVectorDrawble draws itself. This
causes us to constantly invalidate() the view while the animation is running.
Issue #
26591987 Fingerprint icon displayed as dots when batter saver mode is on
Change-Id: I13cbd71fd229db09418c6dcacfec5a13bbb44b2e
Victor Chan [Mon, 25 Jan 2016 20:27:34 +0000 (12:27 -0800)]
Use vector drawables for icons on car navbar
Adjusting CarNavigationButton layout so that vector
drawables are properly scaled/rendered in the car navigation bar.
Change-Id: I71fdfd0d863049a63abf11c41f46c950ed7e309e
Ben Kwa [Tue, 26 Jan 2016 19:50:03 +0000 (11:50 -0800)]
Add MetricsLogger calls to DocumentsUI.
- Create new categories in MetricsLogger for DocumentsUI events.
- Add logging code to DocumentsUI for launch events and viewing roots.
BUG=
26737132
Change-Id: Ib703878a39dd03b57e68a4d5a1d6cf8fe2936c5a
Victor Chan [Fri, 22 Jan 2016 03:44:56 +0000 (19:44 -0800)]
Add Intent extras for package names and categories
CarNavigationBarController will now pass in package names and
categories when starting the Intent for a selected facet.
Change-Id: I9f0a520f28eea105f845881819146d01fddbae92
Julia Reynolds [Tue, 26 Jan 2016 22:08:28 +0000 (22:08 +0000)]
Merge "Visual interruptions: stop more full screen intents."
Jason Monk [Tue, 26 Jan 2016 22:04:16 +0000 (22:04 +0000)]
Merge "Make suggestions handle string or int"
Jason Monk [Tue, 26 Jan 2016 22:01:00 +0000 (17:01 -0500)]
Make suggestions handle string or int
Evidently metadata bundles turn a single int into an integer rather than a
string without telling you.
Change-Id: I5c6557bad51981f27a7e213052e2be5bcc3a0a93
Julia Reynolds [Tue, 26 Jan 2016 22:00:22 +0000 (17:00 -0500)]
Visual interruptions: stop more full screen intents.
The user options for 'no screen interruptions' needs to stop
peeks and full screen intents when the screen is on.
Bug:
25423508
Change-Id: I49b1c40552c3506fae259364a4d5e49168c8de36
Nick Vaccaro [Tue, 26 Jan 2016 21:57:26 +0000 (21:57 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours am:
3e413dfcdd -s ours am:
f5958497d3 -s ours
am:
cee0600bd9 -s ours
* commit '
cee0600bd9c9c9d7a7d777ca3621396c972783db':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Sailesh Nepal [Tue, 26 Jan 2016 21:48:58 +0000 (21:48 +0000)]
Merge "Mark mised call notification as protected"
Yin-Chia Yeh [Tue, 26 Jan 2016 21:27:35 +0000 (13:27 -0800)]
Camera: codegen doc update: fix typos
Change-Id: Ied9e74cb8af839a1ce6d9e247413e4a05e6d894e
Xiaohui Chen [Tue, 26 Jan 2016 21:26:35 +0000 (21:26 +0000)]
Merge changes from topic 'xc_remove_shelf'
* changes:
sysui: remove shelf
DO NOT MERGE sysui: remove shelf
Julia Reynolds [Tue, 26 Jan 2016 21:21:04 +0000 (21:21 +0000)]
Merge "Show app level settings when an app doesn't use topics."
Ji Yang [Tue, 26 Jan 2016 21:18:44 +0000 (21:18 +0000)]
Merge "New string constants shown when new SMS arrives while phone is locked."
Chong Zhang [Tue, 26 Jan 2016 20:52:11 +0000 (20:52 +0000)]
Merge "Restore code to draw backdrop and content nodes"
Chong Zhang [Mon, 25 Jan 2016 20:01:12 +0000 (12:01 -0800)]
Restore code to draw backdrop and content nodes
bug:
26626661
Change-Id: I9e4dd41708e8ed93d3cf64242ad81815a653d269
Julia Reynolds [Mon, 25 Jan 2016 21:36:59 +0000 (16:36 -0500)]
Show app level settings when an app doesn't use topics.
Change-Id: I205062868ac3a44aa24a29bcb82a9374026287a7
Nick Vaccaro [Tue, 26 Jan 2016 20:34:20 +0000 (20:34 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours am:
3e413dfcdd -s ours
am:
f5958497d3 -s ours
* commit '
f5958497d36ac64ed1f2bbbd80cb0a3a24e94f13':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Eino-Ville Talvala [Thu, 21 Jan 2016 21:55:11 +0000 (13:55 -0800)]
Camera2: Add LEVEL_3 to android.info.supportedHardwareLevel
LEVEL_3 is a new high-level label for camera devices that support more
than the existing FULL-level capabilities.
Bug:
25114814
Change-Id: Ibed66ed6b83e4f28598455255d86b13b78f1f13b
Nick Vaccaro [Tue, 26 Jan 2016 20:21:37 +0000 (20:21 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours
am:
3e413dfcdd -s ours
* commit '
3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:16:15 +0000 (20:16 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
am:
907108ca0f -s ours
* commit '
907108ca0f4e69dd170a507c5830591712ec5967':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Marie Janssen [Tue, 26 Jan 2016 20:14:58 +0000 (20:14 +0000)]
Merge "IBluetooth: remove dump(), support arguments"
Nick Vaccaro [Tue, 26 Jan 2016 20:13:26 +0000 (20:13 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
Nathan Harold [Tue, 26 Jan 2016 20:13:26 +0000 (20:13 +0000)]
Merge "Remove Data RealTime Info Listener Support"
Peng Xu [Fri, 22 Jan 2016 08:44:28 +0000 (00:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug:
26481493
Bug:
26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
Chris Wren [Tue, 26 Jan 2016 20:00:58 +0000 (20:00 +0000)]
Merge "change the default notification rules"
Marie Janssen [Wed, 13 Jan 2016 00:05:15 +0000 (16:05 -0800)]
IBluetooth: remove dump(), support arguments
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().
Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
(cherry picked from commit
adbb3ff062e039b2552c6b5ded92e56346ac3934)
Chris Wren [Mon, 25 Jan 2016 22:10:30 +0000 (17:10 -0500)]
change the default notification rules
should make devices less noisy by default
more metrics so we can tell exactly what we're doing.
Change-Id: I2504df91083074de8fe08c896e017335bc0bc1c7
Jason Monk [Tue, 26 Jan 2016 19:52:54 +0000 (19:52 +0000)]
Merge "Updates to SuggestionParser"
Rakesh Iyer [Sat, 23 Jan 2016 03:58:35 +0000 (19:58 -0800)]
Fullscreen user switcher layout tweaks.
The hard coded padding between the disclaimer text and
the UserGridView was causing troubles with smaller screen
sizes so use layout weights instead to achieve the same
results.
Bug:
26749378
Change-Id: I8a3b0784696ad14ec8f9f99a2af649f43d187307
Jason Monk [Tue, 26 Jan 2016 18:57:37 +0000 (13:57 -0500)]
Updates to SuggestionParser
Added support for feature requirements and return after dismiss delays.
Change-Id: I80e80a55817cd4d9717876e34fc591b3dd3228f1
Chris Tate [Tue, 26 Jan 2016 19:39:08 +0000 (19:39 +0000)]
Merge "Prevent (and repair) poisoned full-data backup queue"
Xiaohui Chen [Tue, 26 Jan 2016 19:20:39 +0000 (11:20 -0800)]
sysui: remove shelf
Bug:
26742568
Change-Id: I10bbf55b4b93fb5d360a56dcc59c943d8806a27e
Xiaohui Chen [Tue, 26 Jan 2016 19:21:35 +0000 (11:21 -0800)]
DO NOT MERGE sysui: remove shelf
Bug:
26742568
Change-Id: I36bd013c4adb62b76b6f2789aa490c1484a535d7
Ji Yang [Fri, 22 Jan 2016 01:29:50 +0000 (17:29 -0800)]
New string constants shown when new SMS arrives while phone is locked.
Bug:
26232405
Change-Id: I979daab3d416b16ac4e1e488134f25ff75bad873
John Reck [Tue, 26 Jan 2016 18:59:27 +0000 (18:59 +0000)]
Merge "Fix tests"
Christopher Tate [Fri, 22 Jan 2016 23:05:32 +0000 (15:05 -0800)]
Prevent (and repair) poisoned full-data backup queue
An app that transitioned from full-data to key/value backup regimes
was being left in the full-data backup queue until next reboot. In
edge cases this would result in the app being inappropriately shut
down for backup; furthermore, it would potentially cause there to
exist a full-data payload for the app that was considered "newest"
and therefore be the one delivered at restore time on a new device
or app (re)installation.
Defense in depth: full-backup candidates are just-in-time reevaluated
for validity when they come up again in the queue; app update
notifications cause a reevaluation and removal from the queue if
full-data is no longer the right modality; and the common engine for
all cloud-facing full-data backups does an additional last-ditch
validation that each stated target is actually supposed to get
full-data backups rather than key/value, to backstop the checks on
queue-presence validity.
Bug
26744511
Change-Id: I55bea3e19a2cab0150dbe5a08dd9fc550f0068c4
John Reck [Tue, 26 Jan 2016 18:50:10 +0000 (10:50 -0800)]
Fix tests
Disable FrameBuilder.clippedMerging as it relies on
merged bitmap ops which was disabled in b/
26793764
Fix Buffer to correctly initialize mRefs count
Change-Id: I87d2fcc690a2ae14eaf751f650f522be5b622edf
Philip P. Moltmann [Tue, 26 Jan 2016 18:25:23 +0000 (18:25 +0000)]
Merge "Correctly deal with non-null ness of PrintJobId."
Philip P. Moltmann [Tue, 26 Jan 2016 18:24:37 +0000 (18:24 +0000)]
Merge "Correct nullability in PrintJob."
Philip P. Moltmann [Tue, 26 Jan 2016 18:24:15 +0000 (18:24 +0000)]
Merge "Carry over orientation when updating the printAttributes with the capabilities of the printer."
Tao Bao [Tue, 26 Jan 2016 18:17:37 +0000 (18:17 +0000)]
Merge "Build update engine binder AIDLs for framework use."
Ben Kwa [Tue, 26 Jan 2016 18:11:44 +0000 (18:11 +0000)]
Merge "Temporarily fix directory tile heights in grid mode."
Ben Kwa [Tue, 26 Jan 2016 18:08:24 +0000 (10:08 -0800)]
Temporarily fix directory tile heights in grid mode.
BUG=
26760493
Change-Id: I118e30cdf3892ef6857735f4a4f69a128b3f1c36
John Reck [Tue, 26 Jan 2016 18:06:04 +0000 (18:06 +0000)]
Merge "Temporarily workaround merged bitmap bug"
Shishir Agrawal [Tue, 26 Jan 2016 18:04:39 +0000 (18:04 +0000)]
Merge "DO NOT MERGE : Unhiding MSIM APIs." into mm-wireless-dev
am:
45836d13e5 -s ours
* commit '
45836d13e5d06c787b5039894b6c0ac7c5eb7b7b':
DO NOT MERGE : Unhiding MSIM APIs.
Shishir Agrawal [Tue, 26 Jan 2016 18:00:11 +0000 (18:00 +0000)]
Merge "DO NOT MERGE : Unhiding MSIM APIs." into mm-wireless-dev
Adrian Roos [Tue, 26 Jan 2016 17:42:09 +0000 (17:42 +0000)]
Merge "Crash dialog improvements, move crash code to AppErrors"
Shishir Agrawal [Mon, 25 Jan 2016 21:03:07 +0000 (13:03 -0800)]
DO NOT MERGE : Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.
Bug:
26772894
Change-Id: Ibebab7379ea79c8e4812bbd190342827048e30e2
Wale Ogunwale [Tue, 26 Jan 2016 17:17:21 +0000 (17:17 +0000)]
Merge "Revert "Relaunch activity resumed if it got resumed before relaunching.""
Adrian Roos [Tue, 12 Jan 2016 17:59:43 +0000 (18:59 +0100)]
Crash dialog improvements, move crash code to AppErrors
Factors out the crash and ANR handling code into separate
class and allows clearing cache and restarting app from
crash dialog.
Bug:
22692162
Change-Id: I2a08a4255ea02ab3c7441d351bf278128fcf5a5d
Wale Ogunwale [Tue, 26 Jan 2016 16:47:20 +0000 (08:47 -0800)]
Revert "Relaunch activity resumed if it got resumed before relaunching."
This reverts commit
51dc8be2230758132744ae6204d95e8171784c26.
Due to activities getting multiple resume calls.
Bug:
26116905
Bug:
25674611
Change-Id: Idb4846b6a0efc4d6ac06bf240565f303d9206f0f
John Reck [Tue, 26 Jan 2016 17:01:30 +0000 (09:01 -0800)]
Temporarily workaround merged bitmap bug
Bug:
26569206
Merged bitmap ops are buggy, just turn them off for
now to unblock testing
Change-Id: Ic0151bb3f23b1843107806659a64b26fd6d6e19e
Florin Malita [Tue, 26 Jan 2016 17:00:37 +0000 (17:00 +0000)]
Merge "Add internal Canvas save flags"
Jason Monk [Tue, 26 Jan 2016 16:07:55 +0000 (16:07 +0000)]
Merge "Add user switcher back to QS"
Jason Monk [Tue, 26 Jan 2016 15:56:37 +0000 (10:56 -0500)]
Add user switcher back to QS
Change-Id: Ie3f8139782aee06ad932ded9145162de5e22a824
Andrei Stingaceanu [Wed, 13 Jan 2016 12:10:21 +0000 (12:10 +0000)]
Hide suspended apps from recents
* Introduce a new boolean realActivitySuspended in TaskRecord to
keep track of the suspended state (this also makes sure the
information is persisted across reboots).
* Introduce a new method onPackagesSuspendedChanged
in RecentTasks which flips the realActivitySuspended for each
TaskRecord for the desired user and packages sent
* Register a new broadcast receiver (for SUSPEND/UNSUSPEND)
in ActivityManager#finishBooting which calls
RecentTasks#markPackagesSuspendedStateForUser
* In ActivityManagerService#getRecentTasks filter out
Taskrecords for suspended apps by checking realActivitySuspended
Bug:
22776761
Change-Id: I52e3593ccb2dae223d1ea11d017a6b1626646639
Clara Bayarri [Tue, 26 Jan 2016 15:51:26 +0000 (15:51 +0000)]
Merge "Enable enrolling/authenticating a specific work profile."
John Reck [Tue, 26 Jan 2016 15:21:07 +0000 (15:21 +0000)]
Merge "Add fine-grained debug layer"
Jason Monk [Tue, 26 Jan 2016 14:46:02 +0000 (14:46 +0000)]
Merge "Only show settings drawer on top level items"
Sudheer Shanka [Tue, 26 Jan 2016 14:42:04 +0000 (14:42 +0000)]
Merge "Add support for adding preference summary when disabled by admin."
Sudheer Shanka [Tue, 26 Jan 2016 14:29:29 +0000 (14:29 +0000)]
Merge "Check for null condition in case there is no DPM support."
Sudheer Shanka [Tue, 26 Jan 2016 14:00:16 +0000 (14:00 +0000)]
Check for null condition in case there is no DPM support.
Change-Id: Ie7c70737d0c36ae9efd1920498d9f07b8a7016b1
Clara Bayarri [Thu, 7 Jan 2016 14:17:39 +0000 (14:17 +0000)]
Enable enrolling/authenticating a specific work profile.
This change adds support for a separate profile-specific
fingerprint database. This is to be used together with the work
challenge.
Change-Id: I65b3a74a1c887def210d7a6da0b907138f58a5ba
Przemyslaw Szczepaniak [Tue, 26 Jan 2016 10:52:08 +0000 (10:52 +0000)]
Merge "Fix incorrect @hide usage in libcore" am:
1f3aaf82cb
am:
04785955b5
* commit '
04785955b5be7dc1ba164a0ae02c306b4fdd680d':
Fix incorrect @hide usage in libcore
Przemyslaw Szczepaniak [Tue, 26 Jan 2016 10:47:44 +0000 (10:47 +0000)]
Merge "Fix incorrect @hide usage in libcore"
am:
1f3aaf82cb
* commit '
1f3aaf82cba11c55abc25b551e28344f04a1524a':
Fix incorrect @hide usage in libcore
Victor Chang [Tue, 26 Jan 2016 10:37:55 +0000 (10:37 +0000)]
Merge "Launch managed quick contacts without contact id"
Przemyslaw Szczepaniak [Tue, 26 Jan 2016 10:37:47 +0000 (10:37 +0000)]
Merge "Fix incorrect @hide usage in libcore"
Przemyslaw Szczepaniak [Fri, 22 Jan 2016 10:21:29 +0000 (10:21 +0000)]
Fix incorrect @hide usage in libcore
@hide annotation is only effective in Javadoc.
Bug:
26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit
a0dda9ca9d69fdeff620c7986375589e2a4d8c42)
Narayan Kamath [Tue, 26 Jan 2016 10:04:12 +0000 (10:04 +0000)]
Revert "Update test-current.txt to fix build break."
This reverts commit
7123cbd7374c37ffc88c2ffe1983b60e5f39a82c.
Alan Treadway [Tue, 26 Jan 2016 09:59:40 +0000 (09:59 +0000)]
Merge "Add explicit and persistent user provisioning state."
Benjamin Franz [Tue, 26 Jan 2016 09:52:56 +0000 (09:52 +0000)]
Merge "Add SmallTest annotation to DevicePolicyManagerTest"
Benjamin Franz [Mon, 25 Jan 2016 18:56:38 +0000 (18:56 +0000)]
Add SmallTest annotation to DevicePolicyManagerTest
Adding this annotation makes sure that the tests get picked up by
continuous integration tests.
Change-Id: Ia9166898803dd0037f6bb20cb6a12333ed347fd3