Merge branch '336-remove-testing-activity' into 'master' (5cd2af02) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

5cd2af02

Commit 5cd2af02 authored 8 years ago by str4d

Downloads
- Plain Diff

Merge branch '336-remove-testing-activity' into 'master'

Remove old user feedback activity

Fixes #336.

See merge request !162

parents 29071fcc c72e5be8

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/AndroidManifest.xml 26 additions, 7 deletions

briar-android/AndroidManifest.xml
briar-android/res/values/strings.xml 7 additions, 1 deletion

briar-android/res/values/strings.xml
briar-android/res/xml/settings.xml 10 additions, 1 deletion

briar-android/res/xml/settings.xml
briar-android/res/xml/settings_debug.xml 0 additions, 23 deletions

briar-android/res/xml/settings_debug.xml
briar-android/src/org/briarproject/android/AndroidComponent.java 0 additions, 2 deletions

...ndroid/src/org/briarproject/android/AndroidComponent.java
briar-android/src/org/briarproject/android/TestingActivity.java 0 additions, 452 deletions

...android/src/org/briarproject/android/TestingActivity.java
briar-android/src/org/briarproject/android/TestingConstants.java 2 additions, 10 deletions

...ndroid/src/org/briarproject/android/TestingConstants.java
briar-android/src/org/briarproject/android/fragment/SettingsFragment.java 8 additions, 12 deletions

...c/org/briarproject/android/fragment/SettingsFragment.java

with 53 additions and 508 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment