Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev

res/layout/trusted_credentials.xml

@@ -13,78 +13,26 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<TabHost
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-
-        <TabWidget
-            android:id="@android:id/tabs"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-
-        <FrameLayout
-            android:id="@android:id/tabcontent"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <FrameLayout
-                android:id="@+id/system_tab"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
     <ProgressBar
-                    android:id="@+id/system_progress"
+        android:id="@+id/progress"
         style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                    android:visibility="gone" />
+        android:visibility="gone"/>
 
     <LinearLayout
-                    android:id="@+id/system_content"
+        android:id="@+id/content"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-                    android:visibility="gone"
-                    android:animateLayoutChanges="true">
+        android:visibility="gone">
     </LinearLayout>
 
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/user_tab"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <ProgressBar
-                    android:id="@+id/user_progress"
-                    style="?android:attr/progressBarStyleLarge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/user_content"
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"
-                    android:animateLayoutChanges="true">
-                </LinearLayout>
-
-            </FrameLayout>
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-</TabHost>
+</FrameLayout>

src/com/android/settings/TrustedCredentialsDialogBuilder.java

@@ -34,7 +34,7 @@ import android.widget.Spinner;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TrustedCredentialsSettings.CertHolder;
+import com.android.settings.TrustedCredentialsFragment.CertHolder;
 import com.android.settingslib.RestrictedLockUtils;
 
 import java.security.cert.X509Certificate;