Skip to content

Commit

Permalink
Auto-update
Browse files Browse the repository at this point in the history
  • Loading branch information
google-automerger committed Mar 31, 2015
1 parent 239cb18 commit 817d4e7
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 84 deletions.
5 changes: 1 addition & 4 deletions Application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@ repositories {
jcenter()
}


dependencies {

compile "com.android.support:support-v4:21.0.2"
compile "com.android.support:support-v13:21.0.2"
compile "com.android.support:cardview-v7:21.0.2"

}

// The sample build uses multiple directories to
Expand All @@ -33,7 +30,7 @@ List<String> dirs = [

android {
compileSdkVersion 21
buildToolsVersion "21.1.1"
buildToolsVersion "21.1.2"

defaultConfig {
minSdkVersion 18
Expand Down
36 changes: 0 additions & 36 deletions Application/src/main/res/layout/activity_main.xml

This file was deleted.

21 changes: 1 addition & 20 deletions Application/tests/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->



<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The Android Open Source Project
Expand Down Expand Up @@ -56,4 +37,4 @@
android:targetPackage="com.example.android.jobscheduler"
android:label="Tests for com.example.android.jobscheduler" />

</manifest>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
/*
* Copyright 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/



/*
* Copyright (C) 2013 The Android Open Source Project
*
Expand Down Expand Up @@ -43,7 +25,6 @@
public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {

private MainActivity mTestActivity;
private JobSchedulerFragment mTestFragment;

public SampleTests() {
super(MainActivity.class);
Expand All @@ -58,8 +39,6 @@ protected void setUp() throws Exception {
// flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
// All other fields are null or empty.
mTestActivity = getActivity();
mTestFragment = (JobSchedulerFragment)
mTestActivity.getSupportFragmentManager().getFragments().get(1);
}

/**
Expand All @@ -69,11 +48,10 @@ public void testPreconditions() {
//Try to add a message to add context to your assertions. These messages will be shown if
//a tests fails and make it easy to understand why a test failed
assertNotNull("mTestActivity is null", mTestActivity);
assertNotNull("mTestFragment is null", mTestFragment);
}

/**
* Add more tests below.
*/

}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pre-requisites
--------------

- Android SDK v21
- Android Build Tools v21.1.1
- Android Build Tools v21.1.2
- Android Support Repository

Getting Started
Expand Down

0 comments on commit 817d4e7

Please sign in to comment.