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

4dd9e250

Commit 4dd9e250 authored 9 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '52-appcompat-action-bar' into 'master'

Added AppCompatActivity

Closes #52 

See merge request !14

parents d0ac34e8 cdf83927

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/AndroidManifest.xml 1 addition, 1 deletion

briar-android/AndroidManifest.xml
briar-android/build.gradle 1 addition, 0 deletions

briar-android/build.gradle
briar-android/libs/android-support-v4.jar 0 additions, 0 deletions

briar-android/libs/android-support-v4.jar
briar-android/res/values-v14/styles.xml 0 additions, 10 deletions

briar-android/res/values-v14/styles.xml
briar-android/res/values/color.xml 8 additions, 1 deletion

briar-android/res/values/color.xml
briar-android/res/values/styles.xml 14 additions, 10 deletions

briar-android/res/values/styles.xml
briar-android/src/org/briarproject/android/BaseActivity.java 107 additions, 6 deletions

briar-android/src/org/briarproject/android/BaseActivity.java
briar-android/src/org/briarproject/android/SetupActivity.java 37 additions, 38 deletions

...r-android/src/org/briarproject/android/SetupActivity.java
briar-android/src/org/briarproject/android/StartupFailureActivity.java 1 addition, 1 deletion

.../src/org/briarproject/android/StartupFailureActivity.java

with 169 additions and 67 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