Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev

Browse Source 
am: 19d7eeaedf

* commit '19d7eeaedf4c80ae1d191f201ab028adc88ac2cb':
  PIP: Show recents again when PIP menu is closed
This commit is contained in:
Jaewan Kim
2016-03-02 18:46:55 +00:00
committed by android-build-merger
parent a8ae50b02d 19d7eeaedf
commit 008d56918b
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
View File

@@ -25,6 +25,9 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.android.systemui.R;
import com.android.systemui.SystemUI;
import com.android.systemui.SystemUIApplication;
import com.android.systemui.recents.Recents;
import static android.content.pm.PackageManager.FEATURE_LEANBACK;
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
@@ -214,4 +217,18 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
mPipManager.suspendPipResizing(
PipManager.SUSPEND_PIP_RESIZE_REASON_WAITING_FOR_MENU_ACTIVITY_FINISH);
}
@Override
public void finish() {
super.finish();
if (mPipManager.isRecentsShown()) {
SystemUI[] services = ((SystemUIApplication) getApplication()).getServices();
for (int i = services.length - 1; i >= 0; i--) {
if (services[i] instanceof Recents) {
((Recents) services[i]).showRecents(false, null);
break;
}
}
}
}
}