PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chaohui Wang
2022-04-15 09:55:48 +00:00
committed by Android (Google) Code Review
parent 9b6c604742 3ce806d870
commit fdc32b765d
4 changed files with 1128 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
res/layout/trusted_credentials.xml
View File

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

2
src/com/android/settings/TrustedCredentialsDialogBuilder.java
View File

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

1030
src/com/android/settings/TrustedCredentialsFragment.java Normal file
View File

File diff suppressed because it is too large Load Diff

1061
src/com/android/settings/TrustedCredentialsSettings.java
View File

File diff suppressed because it is too large Load Diff