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

4173fc4d

Commit 4173fc4d authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1045-preference-divider' into 'master'

Don't use a custom widget to separate preference categories

Closes #1045

See merge request !609

parents c6756d21 4fe4c298

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 0 additions, 14 deletions

...briarproject/briar/android/settings/SettingsFragment.java
briar-android/src/main/java/org/briarproject/briar/android/widget/PreferenceDividerDecoration.java 0 additions, 181 deletions

...ect/briar/android/widget/PreferenceDividerDecoration.java
briar-android/src/main/res/layout/divider_preference.xml 6 additions, 0 deletions

briar-android/src/main/res/layout/divider_preference.xml
briar-android/src/main/res/xml/settings.xml 17 additions, 9 deletions

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

with 23 additions and 204 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