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

2896700e

There was a problem fetching the pipeline summary.

Commit 2896700e authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'preference-switches' into 'master'

Replace CheckBoxPreference with the more standard SwitchPreference

See merge request briar/briar!891

parents 42031631 987baba3

1 merge request!891Replace CheckBoxPreference with the more standard SwitchPreference

Pipeline #

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java 5 additions, 5 deletions

...project/briar/android/panic/PanicPreferencesFragment.java
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 20 additions, 21 deletions

...briarproject/briar/android/settings/SettingsFragment.java
briar-android/src/main/res/xml/panic_preferences.xml 3 additions, 3 deletions

briar-android/src/main/res/xml/panic_preferences.xml
briar-android/src/main/res/xml/settings.xml 9 additions, 9 deletions

briar-android/src/main/res/xml/settings.xml

with 37 additions and 38 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