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

Revert "Add a null home activity to Shell.apk"

Browse Source 
This reverts commit 6b1c4a9e09.

Bug: 149226068
Bug: 149307007
Bug: 149780604
Test: $ lunch aosp_crosshatch-userdebug; m
      # flash and boot on a crosshatch
      # Settings -> Apps & notifications -> Default apps -> Home apps
      # Only Quickstep home is there; no Shell home any more
      $ lunch csi_arm64-userdebug; m
      # flash the resulted system.img on a crosshatch and boot
      $ atest DeviceHealthTests # all passed
Change-Id: I927b7dae779da25589f2198e0480c0f2a788a7e4
This commit is contained in:
Isaac Chen
2020-04-29 13:27:01 +08:00
parent fd2f5f66f9
commit 539298c1b9
3 changed files with 0 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/Shell/AndroidManifest.xml
View File

@@ -337,22 +337,6 @@
android:excludeFromRecents="true"
android:exported="false" />
<!--
The following is used as a no-op/null home activity when
no other MAIN/HOME activity is present (e.g., in CSI).
-->
<activity android:name=".NullHome"
android:excludeFromRecents="true"
android:label=""
android:screenOrientation="nosensor">
<!-- The priority here is set to be lower than that for Settings -->
<intent-filter android:priority="-1100">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.HOME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<receiver
android:name=".BugreportRequestedReceiver"
android:permission="android.permission.TRIGGER_SHELL_BUGREPORT">

44
packages/Shell/res/layout/null_home_finishing_boot.xml
View File

@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000"
android:forceHasOverlappingRendering="false">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="40sp"
android:textColor="?android:attr/textColorPrimary"
android:text="@*android:string/android_start_title"/>
<ProgressBar
style="@android:style/Widget.Material.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12.75dp"
android:colorControlActivated="?android:attr/textColorPrimary"
android:indeterminate="true"/>
</LinearLayout>
</FrameLayout>

43
packages/Shell/src/com/android/shell/NullHome.java
View File

@@ -1,43 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.shell;
import android.app.Activity;
import android.os.Bundle;
import android.util.Log;
/**
* This covers the fallback case where no launcher is available.
* Usually Settings.apk has one fallback home activity.
* Settings.apk, however, is not part of CSI, which needs to be
* standalone (bootable and testable).
*/
public class NullHome extends Activity {
private static final String TAG = "NullHome";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.i(TAG, "onCreate");
setContentView(R.layout.null_home_finishing_boot);
}
protected void onDestroy() {
super.onDestroy();
Log.i(TAG, "onDestroy");
}
}