OSDN Git Service
Vladislav Kaznacheev [Fri, 22 Jan 2016 00:41:57 +0000 (00:41 +0000)]
Merge "Zero out DragEvent position when it should not be available"
Michael Wright [Fri, 22 Jan 2016 00:31:40 +0000 (00:31 +0000)]
Merge "Add choreographer API to the NDK."
Michael Wright [Fri, 4 Dec 2015 17:59:42 +0000 (17:59 +0000)]
Add choreographer API to the NDK.
Change-Id: Icb8cffd3cd3bd06814466be72db3e26f6a62cbc6
Jean-Michel Trivi [Fri, 22 Jan 2016 00:30:08 +0000 (00:30 +0000)]
Merge "Unhide audio recording notification API"
Tomasz Mikolajewski [Fri, 22 Jan 2016 00:27:37 +0000 (00:27 +0000)]
Merge "Fix notifications for failures when copying/moving."
Vladislav Kaznacheev [Fri, 22 Jan 2016 00:24:40 +0000 (16:24 -0800)]
Zero out DragEvent position when it should not be available
Bug:
26729675
Change-Id: I46507198deea89c100cb1b99a1ab7ec0719efb12
Filip Gruszczynski [Fri, 22 Jan 2016 00:17:55 +0000 (00:17 +0000)]
Merge "Mark window as replacing when moving task to pinned stack."
Winson Chung [Fri, 22 Jan 2016 00:11:52 +0000 (00:11 +0000)]
Merge changes I91c58397,I7243f30b,I0f6e9dbf,I1eb0864a
* changes:
Adding reveal transition to show app-overlay.
Fixing issue with multiple focus timer animations running.
Fixing several regressions with affiliated tasks.
Starting the dismiss animation in parallel with the gesture.
Winson [Thu, 21 Jan 2016 22:39:23 +0000 (14:39 -0800)]
Adding reveal transition to show app-overlay.
- Instead of long-pressing the icon to launch into app info directly,
this will mirror notifications and reveal a space that can show the
app name and a link to app info.
Change-Id: I91c5839719b030a65744f5e677a436e9c719c578
Winson [Thu, 21 Jan 2016 01:11:29 +0000 (17:11 -0800)]
Fixing issue with multiple focus timer animations running.
Change-Id: I7243f30b917bb311e46efa1e09b44440a0236f07
Winson [Wed, 20 Jan 2016 20:43:35 +0000 (12:43 -0800)]
Fixing several regressions with affiliated tasks.
- Now that we are sorting tasks for freeform and history, ensure that
the affiliated tasks have a useful active time (based on the task
they are affiliated with) for sorting
- Fix issue with the initial stack and focus state not taking the
launch task into account due to the launchTask flag not being set
until the activity was started (now set in RecentsTaskLoadPlan)
- Fixing issue with affiliated tasks not being launched from the stack
due to the animation trigger not firing when the action button is
already hidden/visible
- Fixing issue with title text being occasionally hidden (something we
only need for freeform tasks)
- Tweaking the launch/enter animations for tasks occluded affiliated
tasks
Bug:
26685208
Change-Id: I0f6e9dbf8deec2e4fc15364e686367cc0f57b41f
Winson [Tue, 19 Jan 2016 23:07:07 +0000 (15:07 -0800)]
Starting the dismiss animation in parallel with the gesture.
- Introduces notion of ignored tasks for the purposes of layout in
TaskStackView. This can be used during drag and drop, and while
dismissing to calculate the state of the stack without the task that
the user is currently interacting with.
- Fixing minor layout issue when the front/back task transforms are
improperly calculated when there is a single task
- Fixing minor issue when the anchor task is calculated incorrectly when
dismissing task views
Change-Id: I1eb0864a52e53562e4d573a6ed4f8a5a1615aff9
Adam Powell [Fri, 22 Jan 2016 00:01:41 +0000 (00:01 +0000)]
Merge "Don't show TextView "share" option for an unprovisioned device"
Calin Juravle [Thu, 21 Jan 2016 23:47:23 +0000 (23:47 +0000)]
Merge "Clean up passing volumeUuid to DexOptimizer"
Calin Juravle [Thu, 21 Jan 2016 19:41:42 +0000 (11:41 -0800)]
Clean up passing volumeUuid to DexOptimizer
The argument was redundant.
Also, we should have taken the uuid for shared library from their
package information.
Bug:
26080105
Change-Id: If3d86e00ebecfc13cf63482bce4ac32a119de967
Anthony Chen [Thu, 21 Jan 2016 23:41:45 +0000 (23:41 +0000)]
Merge "Add null checks for various buttons on the Nav Bar."
Makoto Onuki [Thu, 21 Jan 2016 23:39:07 +0000 (23:39 +0000)]
Merge "[FBE] Introduce shadow calllog provider [1/2]"
Makoto Onuki [Tue, 12 Jan 2016 20:57:25 +0000 (12:57 -0800)]
[FBE] Introduce shadow calllog provider [1/2]
Introduce a new provider that's a clone of the calllog provider but
is EA.
The provider is hidden and requires MANAGE_USERS to access.
Bug
26183949
Change-Id: Ie3181a2a68c522b7e513b45218ad06ecd27cda8c
Bryce Lee [Thu, 21 Jan 2016 22:29:42 +0000 (14:29 -0800)]
Improve logging in BluetoothHeadsetClientCall.
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
(cherry picked from commit
fe985fa7f0286df0317b139a375fa8ee36e6a304)
Jean-Michel Trivi [Wed, 13 Jan 2016 02:27:17 +0000 (18:27 -0800)]
Unhide audio recording notification API
Introduce new methods and classes for the audio recording
configuration update and query API.
Callback registration supports a Handler.
Bug
22876530
Change-Id: I819ad464f095d970b5d1d8a3781fcf8dbb310424
Anthony Chen [Wed, 20 Jan 2016 00:57:20 +0000 (16:57 -0800)]
Add null checks for various buttons on the Nav Bar.
CarNavigationBarView extends NavigationBarView and provides a different
layout for the navigation bar which does not include all these buttons.
As a result, SystemUI will crash.
Change-Id: I1be079814faa26925721ec86a6f108506f54b99e
Santos Cordon [Thu, 21 Jan 2016 22:35:52 +0000 (22:35 +0000)]
Merge "Add metadata for car-mode in-call."
Roozbeh Pournader [Thu, 21 Jan 2016 22:17:31 +0000 (22:17 +0000)]
Merge "Implement smarter locale resource selection"
Adam Lesinski [Thu, 21 Jan 2016 22:13:15 +0000 (22:13 +0000)]
Merge "AAPT2: Accept empty zip files"
Santos Cordon [Fri, 11 Dec 2015 01:29:54 +0000 (17:29 -0800)]
Add metadata for car-mode in-call.
Change-Id: Ic2d55889e0ab65195bee549837b51c581ce5076a
Doris Liu [Thu, 21 Jan 2016 21:49:54 +0000 (21:49 +0000)]
Merge "Create SkCanvas on the stack to avoid leaking memeory"
Chong Zhang [Thu, 21 Jan 2016 21:48:55 +0000 (21:48 +0000)]
Merge "Fixes for broken saved surface"
Roozbeh Pournader [Fri, 15 Jan 2016 19:23:42 +0000 (11:23 -0800)]
Implement smarter locale resource selection
* Add support for determining script from language and region.
* Add support for determining special parents of locales.
* Add support for smart comparison of locales with only a difference
in region, using the locale parentage tree.
* Fix LocaleData.matchScore() to not fallback to old locale matching
behavior if we can't determine a script.
* Allow four-character variant codes. (Previously, only five- to
eight-character variant codes were allowed.)
Bug:
7296673
Bug:
26589793
Change-Id: Ibde0a48c0564ff383b41068095a5cbacfe7b94bc
Steve McKay [Thu, 21 Jan 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Move delete support into FileOperationService."
Makoto Onuki [Thu, 21 Jan 2016 21:36:45 +0000 (21:36 +0000)]
Merge "SUW shouldn't use hidden APIs."
Makoto Onuki [Thu, 21 Jan 2016 21:34:59 +0000 (21:34 +0000)]
Merge "Add missing system broadcast actions to the protected list."
Chong Zhang [Thu, 21 Jan 2016 03:52:22 +0000 (19:52 -0800)]
Fixes for broken saved surface
- Reset and restore the visibility flags and hasSurface states when
surface is saved or restored. When the surface is in saved stated,
we have to make the rest of the system believe that the window has
no surface.
- Set app windows to 'mExiting' when we start a transistion because
window manager changes the visibility of the app. We can't rely on
receiving a relayoutWindow from the app to invisible. We need to
mark it exiting so that when the transition is done, the surfaces
get removed (or saved if possible) promptly.
- We need to save the surface if the app token is the last one in
a task, regardless of whether it's visible, this means the whole
task is going into background. But if the app has another visible
token on top of it, we don't need to save it. For example one
activity launches another activity, in this case we don't want to
save the surface of the activity on the bottom.
bug:
26573100
Change-Id: Id845f87b30cda1cebcc12ad2ac8dbf19a068a86e
Ben Kwa [Thu, 21 Jan 2016 21:28:46 +0000 (21:28 +0000)]
Merge "Rework selection handling for items in the DirectoryFragment."
Vladislav Kaznacheev [Thu, 21 Jan 2016 21:26:11 +0000 (21:26 +0000)]
Merge "Send ACTION_DRAG_LOCATION right after ACTION_DRAG_STARTED"
Doris Liu [Thu, 21 Jan 2016 20:55:54 +0000 (12:55 -0800)]
Create SkCanvas on the stack to avoid leaking memeory
Bug:
26447978
Change-Id: Ied022c103c3b08e9cfc3cb775a8c95fd5461e81d
Oleksandr Peletskyi [Thu, 21 Jan 2016 20:25:46 +0000 (20:25 +0000)]
Merge "Added restriction if a user is allowed to change the icon. BUG:
25305966"
Ben Kwa [Fri, 15 Jan 2016 18:43:24 +0000 (10:43 -0800)]
Rework selection handling for items in the DirectoryFragment.
- Remove the gesture detector from the MultiSelectManager, and
consolidate gesture detection and event dispatch logic in
DirectoryFragment.GestureListener.
- Route single-tap events through the DocumentHolder, so that it can
apply view-specific logic, like making a tap on the item's icon
select rather than activate.
- Consolidate event handling logic in the ItemEventListener.
- Add new unit tests for DocumentHandler.
BUG=
24326546
Change-Id: Id15cdd11b13e4c063c1baff95aa8ee09c190d6c3
Makoto Onuki [Thu, 21 Jan 2016 20:17:14 +0000 (12:17 -0800)]
Add missing system broadcast actions to the protected list.
Bug
26697573
Change-Id: I39e6b90b38c6e1dbe4978be1cb2a10d72b015cba
Steve McKay [Wed, 20 Jan 2016 23:09:35 +0000 (15:09 -0800)]
Move delete support into FileOperationService.
Refactor Jobs to work with files from multiple providers.
Don't shut down threadpool until service#onDestroy is called.
Bug:
26696797,
26462789,
26567205,
25162803,
26714663
Change-Id: Id43e8e3dc2294cd07dcd6a3477b19efb298c260f
Matt Wu [Thu, 21 Jan 2016 20:09:36 +0000 (20:09 +0000)]
Merge "Set WindowSession's touchmode when in local focus mode,"
Oleksandr Peletskyi [Mon, 18 Jan 2016 14:40:21 +0000 (15:40 +0100)]
Added restriction if a user is allowed to change the icon.
BUG:
25305966
Change-Id: I3d527224f00087b2bd959879ebb143e2ecb9c914
Alan Viverette [Thu, 21 Jan 2016 19:49:00 +0000 (19:49 +0000)]
Merge "Remove unnecessary @inheritDoc, add missing @Override to ViewGroup"
Matthew Williams [Thu, 21 Jan 2016 19:30:43 +0000 (19:30 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e am:
4831ef3872 am:
d877135d61
am:
caf53acdd7 -s ours
* commit '
caf53acdd7d4d1c2ec4d5678aa9b6a1c5c1340f8':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:25:51 +0000 (19:25 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e am:
4831ef3872
am:
d877135d61
* commit '
d877135d616321b4b3013b302e8615a8f8b04ffa':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:20:31 +0000 (19:20 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e
am:
4831ef3872
* commit '
4831ef3872f7f5c5d2ea0838f0958412e3833aeb':
DO NOT MERGE Redact Account info from getCurrentSyncs
Adam Powell [Thu, 21 Jan 2016 19:19:01 +0000 (19:19 +0000)]
Merge "Init child fragments consistently with activity fragments"
Phil Weaver [Thu, 21 Jan 2016 19:17:48 +0000 (19:17 +0000)]
Merge "Pass drawing order information to accessibility."
Matthew Williams [Thu, 21 Jan 2016 19:13:32 +0000 (19:13 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e
am:
c151cec56e
* commit '
c151cec56ec3666b5bb20e8cf7c3dca2500ea353':
DO NOT MERGE Redact Account info from getCurrentSyncs
Siyamed Sinir [Thu, 21 Jan 2016 19:12:28 +0000 (19:12 +0000)]
Merge "Sort the result of SpannableStringBuilder.getSpans"
Matthew Williams [Thu, 21 Jan 2016 19:08:07 +0000 (19:08 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d
am:
08d7e9608e
* commit '
08d7e9608ea822815b15be15a66f26be664ce541':
DO NOT MERGE Redact Account info from getCurrentSyncs
Adam Lesinski [Thu, 21 Jan 2016 19:04:46 +0000 (11:04 -0800)]
AAPT2: Accept empty zip files
The libziparchive returns an error on empty zip files.
Work around this by checking for that error condition and
returning an empty ZipFileCollection.
Change-Id: I9edaf2e089456b6ccb4bb099b20ede10331bd352
Kenny Guy [Thu, 21 Jan 2016 19:04:20 +0000 (19:04 +0000)]
Merge "Update PackageMonitor and LauncherApps for suspended apps."
Matthew Williams [Thu, 21 Jan 2016 19:01:02 +0000 (19:01 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours
am:
5cb2597a9d
* commit '
5cb2597a9da3202229fdbc91c12b8e172b2b5667':
DO NOT MERGE Redact Account info from getCurrentSyncs
Sergey Poromov [Thu, 21 Jan 2016 18:55:28 +0000 (18:55 +0000)]
Merge "Introduce BackupManager#requestBackup & BackupObserver API"
Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2
am:
1f6dbd910b -s ours
* commit '
1f6dbd910bf9bf93df8a708209e92add61fbff44':
DO NOT MERGE Redact Account info from getCurrentSyncs
Adam Powell [Thu, 21 Jan 2016 18:49:39 +0000 (10:49 -0800)]
Don't show TextView "share" option for an unprovisioned device
Bug
26600141
Change-Id: Ifc59752c146c2203a66cdd463b648a891ebf12c8
Matthew Williams [Thu, 21 Jan 2016 18:48:55 +0000 (18:48 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4
am:
9e52b29fe2
* commit '
9e52b29fe27035df4720db582637157ce9ce268d':
DO NOT MERGE Redact Account info from getCurrentSyncs
Andrei Stingaceanu [Thu, 14 Jan 2016 19:10:08 +0000 (19:10 +0000)]
Suspend apps - block
* kill app when suspending
* block starting ONLY activities for suspended apps
* do not allow suspending the device admin package
Bug:
22776761
Change-Id: I3ee5fcb2d6828f363ce0f024dbc662ab29275192
Rakesh Iyer [Thu, 21 Jan 2016 18:47:07 +0000 (18:47 +0000)]
Merge "Commandeer full screen user switcher for auto."
Matthew Williams [Thu, 21 Jan 2016 18:41:55 +0000 (18:41 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours
am:
a76208d4e4
* commit '
a76208d4e4f7f690f5fde4210a00a5c3022721bd':
DO NOT MERGE Redact Account info from getCurrentSyncs
Amith Yamasani [Thu, 21 Jan 2016 18:40:40 +0000 (18:40 +0000)]
Merge "Don't allow user creation intent to work on non-admin users"
Adam Powell [Thu, 14 Jan 2016 20:58:23 +0000 (12:58 -0800)]
Init child fragments consistently with activity fragments
Fragments contained within an activity are restored from instance
state in FragmentActivity.onCreate, but fragments contained within
another fragment were previously restored from instance state in
performCreate after onCreate returned. This meant that developers
couldn't consistently rely on being able to control when this happens
with a call to super.onCreate, and calls to findFragmentByTag to
reconnect with a restored child fragment would fail in ways that
succeed when the fragment is directly added to an activity.
Change child fragment instance state restore to happen during
Fragment.onCreate instead of in performCreate to be consistent with
activity behavior. Preserve the old behavior for apps targeting
an SDK version < N.
Change-Id: I9c88d5554da9a32219d64c70ca638f75ecb233ed
Matthew Williams [Thu, 21 Jan 2016 18:37:01 +0000 (18:37 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a
am:
9c841923df -s ours
* commit '
9c841923dfc36db046909e388b8a2fda3b694be1':
DO NOT MERGE Redact Account info from getCurrentSyncs
Phil Weaver [Fri, 8 Jan 2016 19:49:32 +0000 (11:49 -0800)]
Pass drawing order information to accessibility.
Bug:
22721935
Change-Id: I45a2be7c174c8b5a469b68a45dec0eb536825d92
Filip Gruszczynski [Thu, 21 Jan 2016 18:30:45 +0000 (10:30 -0800)]
Mark window as replacing when moving task to pinned stack.
Bug:
25672053
Change-Id: I0b66faf5af25edba55c4cb51b3527dee2a528451
Matthew Williams [Thu, 21 Jan 2016 18:29:33 +0000 (18:29 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours
am:
0d3e46391a
* commit '
0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
DO NOT MERGE Redact Account info from getCurrentSyncs
Ritesh Reddy [Thu, 21 Jan 2016 18:20:56 +0000 (18:20 +0000)]
Merge "Stopped closing State FDs in AccountSyncSettingsBackupHelper"
Matthew Williams [Thu, 21 Jan 2016 18:19:53 +0000 (18:19 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0
am:
5fc753acaf -s ours
* commit '
5fc753acaf9731742957db256b2818376fe8c4a4':
DO NOT MERGE Redact Account info from getCurrentSyncs
Xiaohui Chen [Thu, 21 Jan 2016 18:17:54 +0000 (18:17 +0000)]
Merge "sysui: refactor PhoneStatusBar"
Sergey Poromov [Tue, 15 Dec 2015 15:26:23 +0000 (16:26 +0100)]
Introduce BackupManager#requestBackup & BackupObserver API
Introduces a way to request immediate backup for list of packages
and receive callbacks on backup progress.
Bug:
25688526
Change-Id: Ib826933d44f4ebf2b981f8be366215b2d37847e2
Matthew Williams [Thu, 21 Jan 2016 18:14:32 +0000 (18:14 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93
am:
06ef7dfdf0
* commit '
06ef7dfdf0a3efb44326228c55309ec6df134376':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:07:55 +0000 (18:07 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
am:
a5cafd2a93
* commit '
a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs
Jack Yu [Thu, 21 Jan 2016 18:07:50 +0000 (18:07 +0000)]
Merge "Data call retry refactoring" into mm-wireless-dev
am:
599f62562b
* commit '
599f62562b6102f9e3830d5b32a282d23c59e2fd':
Data call retry refactoring
Clara Bayarri [Thu, 21 Jan 2016 17:45:59 +0000 (17:45 +0000)]
Merge "Fix missing clear identity in AMS.AppTaskImpl#moveToFront"
Jason Monk [Thu, 21 Jan 2016 17:45:04 +0000 (17:45 +0000)]
Merge "Work on QS layouts"
Jack Yu [Thu, 21 Jan 2016 17:43:19 +0000 (17:43 +0000)]
Merge "Data call retry refactoring" into mm-wireless-dev
Clara Bayarri [Thu, 21 Jan 2016 17:13:15 +0000 (17:13 +0000)]
Fix missing clear identity in AMS.AppTaskImpl#moveToFront
Bug:
26683257
Change-Id: Ic70864aa3e33a5362278b498e2763ce8a70e8fe4
Xiaohui Chen [Tue, 19 Jan 2016 21:52:07 +0000 (13:52 -0800)]
sysui: refactor PhoneStatusBar
Change-Id: I4177d1d02fbafc88ad522bc483e22a68ede075ff
Sergio Giro [Thu, 21 Jan 2016 17:25:12 +0000 (17:25 +0000)]
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" am:
eb93182dfb
am:
e2296d490d
* commit '
e2296d490dba8dad4d3d0831d94c4194c9ed37f3':
org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
John Reck [Thu, 21 Jan 2016 17:21:05 +0000 (17:21 +0000)]
Merge "Ensure Texture always binds to self"
Sergio Giro [Thu, 21 Jan 2016 17:20:41 +0000 (17:20 +0000)]
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"
am:
eb93182dfb
* commit '
eb93182dfb862df27e479d30c7b8e12f13e5def5':
org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
Ben Wagner [Thu, 21 Jan 2016 17:13:05 +0000 (17:13 +0000)]
Merge "Remove NanumGothic and DroidSansFallback from fonts.xml."
John Reck [Thu, 21 Jan 2016 17:08:42 +0000 (09:08 -0800)]
Ensure Texture always binds to self
Bug:
26584230
In the event that Texture decides it doesn't
need to actually call glTexImage2D/glSubTexImage2D
it needs to still activateTexture(0) and bindTexture(mId)
as this is the expected state after Texture::upload()
is called.
Change-Id: I62d689a9057907a10dda2bc8f40c3113e43b93b2
Sergio Giro [Thu, 21 Jan 2016 17:08:21 +0000 (17:08 +0000)]
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"
Youngsang Cho [Thu, 21 Jan 2016 17:08:05 +0000 (17:08 +0000)]
Merge "Close picture-in-picture when a fullscreen app starts to play a video"
Youngsang Cho [Sat, 16 Jan 2016 00:59:27 +0000 (16:59 -0800)]
Close picture-in-picture when a fullscreen app starts to play a video
Bug:
26549507
Change-Id: I27e8f7b1847bf0e34e7c47bf6303c425c3eb9127
Sergio Giro [Thu, 21 Jan 2016 15:25:01 +0000 (15:25 +0000)]
org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.
Bug:
26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
Ben Wagner [Thu, 21 Jan 2016 16:45:13 +0000 (11:45 -0500)]
Remove NanumGothic and DroidSansFallback from fonts.xml.
These two fonts are no longer installed on a device.
This leaves the fonts themselves in place for the sdk build.
Change-Id: Ib69e73a6682d7eedd7b824f1dadc79cbccf07605
Philip P. Moltmann [Thu, 21 Jan 2016 16:06:45 +0000 (16:06 +0000)]
Merge "Treat empty strings similar to null-strings when composing the subtitle in the SelectPrinterActivity."
Philip P. Moltmann [Thu, 21 Jan 2016 16:06:17 +0000 (16:06 +0000)]
Merge "Shorten LOG_TAGs to fit in 23 characters as commented on by lint."
Alan Viverette [Thu, 21 Jan 2016 15:50:10 +0000 (10:50 -0500)]
Remove unnecessary @inheritDoc, add missing @Override to ViewGroup
No functional changes. The default behavior for overridden methods is
@inheritDoc, so a standalone annotation is not necessary.
Change-Id: I3ace1989e9035ecf3cf8f7acc5391de1c1ff7c65
Jason Monk [Wed, 20 Jan 2016 21:33:46 +0000 (16:33 -0500)]
Work on QS layouts
Better layouts, less work, more columns... sometimes.
Also fix some bugs.
Bug:
26705136
Change-Id: Ia368791259a1a91522a3efb70729919da79e37ea
Alan Viverette [Thu, 21 Jan 2016 15:24:27 +0000 (15:24 +0000)]
Merge "Move alert dialog title into date picker header"
Kenny Guy [Fri, 15 Jan 2016 13:29:06 +0000 (13:29 +0000)]
Update PackageMonitor and LauncherApps for suspended apps.
Allow launchers to read ApplicationInfo from LauncherApps
to support suspended flag.
Provide callback to launchers via LauncherApps for suspend
/unsuspend broadcasts.
Change-Id: I772a121c45f60f926e8343bb6f181bef4e8929d3
Sudheer Shanka [Thu, 21 Jan 2016 14:22:50 +0000 (14:22 +0000)]
Merge "Add a guard against NullPointerException in RestrictedLockUtils."
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit
b63057e698a01dafcefc7ba09b397b0336bba43d)
Sudheer Shanka [Thu, 21 Jan 2016 13:47:51 +0000 (13:47 +0000)]
Add a guard against NullPointerException in RestrictedLockUtils.
Change-Id: I1eb7852cf58a4435a2c7627a569ade5f44855bf7
Jerome Gaillard [Thu, 21 Jan 2016 13:19:57 +0000 (13:19 +0000)]
Deals with translation and scaling in layoutlib am:
ded4d14e33
am:
cc90965d8f
* commit '
cc90965d8f3b8779fc477ec8a43b16306e5da535':
Deals with translation and scaling in layoutlib
Jerome Gaillard [Thu, 21 Jan 2016 13:16:02 +0000 (13:16 +0000)]
Deals with translation and scaling in layoutlib
am:
ded4d14e33
* commit '
ded4d14e3348ebb0cdfa3498a53d3fbfc58b2043':
Deals with translation and scaling in layoutlib
Rubin Xu [Thu, 21 Jan 2016 12:49:11 +0000 (12:49 +0000)]
Merge "Log app process start from ActivityManagerService"