Merge branch 'factor_out_keyagreement_ui-theme' into 'master'
Factor out keyagreement ui theme See merge request briar/briar!835
Showing
- briar-android/src/main/AndroidManifest.xml 1 addition, 1 deletionbriar-android/src/main/AndroidManifest.xml
- briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 5 additions, 2 deletions...riarproject/briar/android/activity/ActivityComponent.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java 2 additions, 2 deletions...iarproject/briar/android/contact/ContactListFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java 26 additions, 2 deletions...g/briarproject/briar/android/keyagreement/CameraView.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java 144 additions, 0 deletions...t/briar/android/keyagreement/ContactExchangeActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java 7 additions, 103 deletions...ject/briar/android/keyagreement/KeyAgreementActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java 95 additions, 121 deletions...ject/briar/android/keyagreement/KeyAgreementFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java 63 additions, 0 deletions.../java/org/briarproject/briar/android/view/QrCodeView.java
- briar-android/src/main/res/layout-land/fragment_keyagreement_qr.xml 0 additions, 110 deletions...oid/src/main/res/layout-land/fragment_keyagreement_qr.xml
- briar-android/src/main/res/layout/fragment_keyagreement_qr.xml 3 additions, 38 deletions...-android/src/main/res/layout/fragment_keyagreement_qr.xml
- briar-android/src/main/res/layout/qr_code_view.xml 39 additions, 0 deletionsbriar-android/src/main/res/layout/qr_code_view.xml
Loading
Please register or sign in to comment