Merge branch 'database' into development (e5819ff2) · Commits · Classes / CIS 298 / a4 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

a4
- Activity
- Members
- Releases
- Package Registry
- Terraform modules

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption, please take a look at our documentation.

Classes
CIS 298
a4
Commits
e5819ff2

Commit e5819ff2 authored 9 years ago by

Brandon Rodriguez

Downloads
- Plain Diff

Merge branch 'database' into development

parents bc3ad167 caff5139

Branches

Tags

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

WicedSense/app/src/main/AndroidManifest.xml 1 addition, 1 deletion

WicedSense/app/src/main/AndroidManifest.xml
WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java 228 additions, 163 deletions

...c/main/java/com/broadcom/app/wicedsense/MainActivity.java
WicedSense/app/src/main/java/com/broadcom/app/wicedsense/ThermoBaseHelper.java 38 additions, 0 deletions

...in/java/com/broadcom/app/wicedsense/ThermoBaseHelper.java
WicedSense/app/src/main/java/com/broadcom/app/wicedsense/WicedDBSchema.java 18 additions, 0 deletions

.../main/java/com/broadcom/app/wicedsense/WicedDBSchema.java
WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java 3 additions, 1 deletion

...pp/src/main/java/com/broadcom/ui/ExitConfirmFragment.java
WicedSense/app/src/main/res/layout/database_output.xml 7 additions, 0 deletions

WicedSense/app/src/main/res/layout/database_output.xml
WicedSense/app/src/main/res/menu/main.xml 2 additions, 2 deletions

WicedSense/app/src/main/res/menu/main.xml
WicedSense/app/src/main/res/values/strings.xml 2 additions, 0 deletions

WicedSense/app/src/main/res/values/strings.xml

with 299 additions and 167 deletions

0% 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