cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate to androidx

Browse Source
This commit is contained in:
Vincent Breitmoser
2019-11-15 12:09:08 +01:00
parent 5cd210831b
commit 5172002f0e
343 changed files with 946 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml
View File

@@ -9,7 +9,7 @@
android:paddingRight="24dp"
android:paddingTop="16dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/keyserver_url_edit_text_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -25,9 +25,9 @@
android:imeOptions="actionDone"
android:inputType="textUri" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/keyserver_onion_edit_text_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
android:imeOptions="actionDone"
android:inputType="textUri" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<CheckBox

4
OpenKeychain/src/main/res/layout/add_smartpgp_authority_dialog.xml
View File

@@ -9,7 +9,7 @@
android:paddingRight="24dp"
android:paddingTop="16dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/smartpgp_authority_alias_edit_text_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
android:imeOptions="actionDone"
android:inputType="textUri" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/smartpgp_authority_filename"

2
OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
View File

@@ -21,7 +21,7 @@
android:layout_height="@dimen/statusbar_height"
android:background="?attr/colorPrimary" />
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"

2
OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml
View File

@@ -97,7 +97,7 @@
android:text="There are multiple keys that could be used to encrypt to this address. Please choose from the list:"
/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/duplicate_key_list"

2
OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml
View File

@@ -81,7 +81,7 @@
android:text="These are the keys that could be used for authentication. Please choose from the list:"
/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/authentication_key_list"

2
OpenKeychain/src/main/res/layout/api_select_identity_key.xml
View File

@@ -217,7 +217,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/identity_key_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml
View File

@@ -20,7 +20,7 @@
android:text="@string/certify_fingerprint_text"
android:textAppearance="?android:attr/textAppearanceMedium" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/certify_fingerprint_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>

2
OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
View File

@@ -35,7 +35,7 @@
android:hint="@string/label_email"
android:ems="10" />
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/create_key_emails"
android:scrollbars="vertical"
android:layout_width="match_parent"

2
OpenKeychain/src/main/res/layout/decrypt_files_list_fragment.xml
View File

@@ -11,7 +11,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/decrypted_files_list"
android:scrollbars="vertical"
android:layout_width="match_parent"

4
OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:custom="http://schemas.android.com/apk/res-auto"
@@ -312,4 +312,4 @@
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

2
OpenKeychain/src/main/res/layout/dialog_insecure_generic.xml
View File

@@ -32,7 +32,7 @@
android:measureAllChildren="true"
custom:initialView="1">
<android.support.v4.widget.Space
<androidx.legacy.widget.Space
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

2
OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
View File

@@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/selected_files_list"
android:paddingLeft="16dp"
android:paddingRight="16dp"

4
OpenKeychain/src/main/res/layout/fake_dialog.xml
View File

@@ -4,13 +4,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center">
<include layout="@layout/admin_pin_dialog" />
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</FrameLayout>

2
OpenKeychain/src/main/res/layout/help_activity.xml
View File

@@ -8,7 +8,7 @@
android:id="@+id/toolbar_tabs"
layout="@layout/toolbar_tabs" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />

2
OpenKeychain/src/main/res/layout/identities_card.xml
View File

@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:text="@string/section_user_ids" />
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/view_key_user_ids"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
OpenKeychain/src/main/res/layout/import_keys_list_basic_item.xml
View File

@@ -7,7 +7,7 @@
<variable name="number" type="int" />
</data>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
<androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
@@ -59,6 +59,6 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</layout>

2
OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
View File

@@ -55,7 +55,7 @@
</LinearLayout>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"

4
OpenKeychain/src/main/res/layout/import_keys_list_item.xml
View File

@@ -9,7 +9,7 @@
<variable name="entry" type="ImportKeysListEntry" />
</data>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
<androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -93,6 +93,6 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</layout>

2
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@@ -38,7 +38,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"

2
OpenKeychain/src/main/res/layout/main_activity.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
OpenKeychain/src/main/res/layout/qr_code_activity.xml
View File

@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/qr_code_image_layout"
android:transitionName="qr_code"
android:layout_gravity="center_vertical"
@@ -32,7 +32,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerInside"/>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/remote_security_issue_dialog.xml
View File

@@ -106,7 +106,7 @@
android:visibility="gone"
style="?buttonBarButtonStyle" />
<android.support.v4.widget.Space
<androidx.legacy.widget.Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -145,7 +145,7 @@
android:id="@+id/button_override_back"
style="?buttonBarButtonStyle" />
<android.support.v4.widget.Space
<androidx.legacy.widget.Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"

4
OpenKeychain/src/main/res/layout/security_key_shop_fragment.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -34,4 +34,4 @@
app:layout_constraintStart_toStartOf="@+id/shop_progressbar"
app:layout_constraintTop_toBottomOf="@+id/shop_progressbar" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
OpenKeychain/src/main/res/layout/settings_keyserver_fragment.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/keyserver_recycler_view"
android:layout_width="match_parent"

2
OpenKeychain/src/main/res/layout/settings_smartpgp_authority_fragment.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/smartpgp_authority_recycler_view"
android:layout_width="match_parent"

2
OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="@dimen/statusbar_height"
android:background="@color/transparent" />
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"

2
OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="@dimen/statusbar_height"
android:background="@color/transparent" />
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"

4
OpenKeychain/src/main/res/layout/transfer_fragment.xml
View File

@@ -37,7 +37,7 @@
android:gravity="center_horizontal"
android:weightSum="1">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.75"
@@ -55,7 +55,7 @@
tools:tint="@color/md_black_1000"
/>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>

24
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -8,7 +8,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
android:fitsSystemWindows="true"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<android.support.design.widget.FixedCollapsingToolbarLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -145,7 +145,7 @@
android:visibility="invisible"
tools:visibility="visible" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/view_key_qr_code_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -168,11 +168,11 @@
android:id="@+id/view_key_qr_code"
android:layout_width="96dp"
android:layout_height="96dp" />
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</RelativeLayout>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -183,11 +183,11 @@
app:layout_collapseMode="pin"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute" />
</android.support.design.widget.FixedCollapsingToolbarLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<android.support.v4.widget.FlingNestedScrollView
<androidx.core.widget.NestedScrollView
android:id="@+id/scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -216,9 +216,9 @@
</LinearLayout>
</android.support.v4.widget.FlingNestedScrollView>
</androidx.core.widget.NestedScrollView>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:contentDescription="@string/cd_exchange_keys"
android:layout_width="wrap_content"
@@ -230,4 +230,4 @@
app:layout_anchorGravity="bottom|right|end"
tools:visibility="visible" />
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
OpenKeychain/src/main/res/layout/view_key_adv_activity.xml
View File

@@ -8,7 +8,7 @@
android:id="@+id/toolbar_tabs"
layout="@layout/toolbar_tabs" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />

4
OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
View File

@@ -68,7 +68,7 @@
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/view_key_qr_code_layout"
android:transitionName="qr_code"
android:visibility="visible"
@@ -88,7 +88,7 @@
android:id="@+id/view_key_qr_code"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<TextView
style="@style/SectionHeader"

4
OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml
View File

@@ -26,7 +26,7 @@ xmlns:tools="http://schemas.android.com/tools">
android:layout_marginTop="8dp"
android:text="@string/section_keys" />
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/view_key_subkeys"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -48,7 +48,7 @@ xmlns:tools="http://schemas.android.com/tools">
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/view_key_subkey_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
OpenKeychain/src/main/res/layout/view_key_adv_user_ids_fragment.xml
View File

@@ -71,7 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/view_key_subkey_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View File

@@ -9,7 +9,7 @@
android:paddingRight="16dp"
android:paddingTop="16dp">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/subkey_status_card"
android:layout_gravity="center"
android:layout_width="match_parent"
@@ -50,7 +50,7 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<org.sufficientlysecure.keychain.ui.keyview.view.IdentitiesCardView
android:id="@+id/card_identities"

2
OpenKeychain/src/main/res/menu/import_keys_cloud_fragment.xml
View File

@@ -6,7 +6,7 @@
android:id="@+id/menu_import_keys_cloud_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/menu_search"
app:actionViewClass="android.support.v7.widget.SearchView"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="collapseActionView|always" />
<item

2
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -6,7 +6,7 @@
android:id="@+id/menu_key_list_search"
android:title="@string/menu_search"
android:icon="@drawable/ic_search_white_24dp"
app:actionViewClass="android.support.v7.widget.SearchView"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="collapseActionView|always" />
<item