Skip to content
This repository was archived by the owner on Sep 13, 2019. It is now read-only.

Commit c6d5cb3

Browse files
Jeremy WalkerJeremy Walker
authored andcommitted
Update library version and clean up XML.
Bug: 117618327 Test: Manually tested. Change-Id: I395f98932ff0aa5a99af017dd64abfaa9f013078
1 parent 3f82973 commit c6d5cb3

6 files changed

Lines changed: 23 additions & 19 deletions

File tree

app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ repositories {
88

99
dependencies {
1010
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
11-
implementation "androidx.lifecycle:lifecycle-runtime:2.0.0-rc01"
12-
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0-rc01"
13-
implementation "androidx.lifecycle:lifecycle-common:2.0.0-rc01"
14-
implementation "androidx.slice:slice-view:1.0.0-rc02"
15-
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha5"
16-
implementation "androidx.appcompat:appcompat:1.0.0-rc02"
17-
implementation "androidx.cardview:cardview:1.0.0-rc02"
18-
implementation "androidx.core:core-ktx:1.0.0-rc02"
11+
implementation "androidx.lifecycle:lifecycle-runtime:2.0.0"
12+
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
13+
implementation "androidx.lifecycle:lifecycle-common:2.0.0"
14+
implementation "androidx.slice:slice-view:1.0.0"
15+
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha6"
16+
implementation "androidx.appcompat:appcompat:1.0.0"
17+
implementation "androidx.cardview:cardview:1.0.0"
18+
implementation "androidx.core:core-ktx:1.0.0"
1919
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
2020
}
2121

app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,35 @@
2323
android:icon="@drawable/ic_launcher"
2424
android:label="@string/app_name"
2525
android:theme="@style/AppTheme">
26+
2627
<activity
2728
android:name=".ui.list.SliceViewerActivity"
2829
android:exported="true"
2930
android:label="@string/app_name"
3031
android:theme="@style/AppTheme.NoActionBar">
32+
3133
<intent-filter>
3234
<action android:name="android.intent.action.MAIN" />
33-
3435
<category android:name="android.intent.category.LAUNCHER" />
3536
</intent-filter>
37+
3638
<intent-filter>
3739
<action android:name="androidx.intent.SLICE_ACTION" />
38-
3940
<category android:name="android.intent.category.DEFAULT" />
4041
</intent-filter>
4142
</activity>
43+
4244
<activity
4345
android:name=".ui.single.SingleSliceViewerActivity"
4446
android:exported="true"
4547
android:label="@string/single_slice_viewer_activity"
4648
android:theme="@style/AppTheme">
49+
4750
<intent-filter>
4851
<action android:name="androidx.intent.SLICE_ACTION" />
49-
5052
<category android:name="android.intent.category.DEFAULT" />
5153
</intent-filter>
54+
5255
<intent-filter>
5356
<action android:name="android.intent.action.VIEW" />
5457

@@ -65,12 +68,11 @@
6568
android:name=".provider.SampleSliceProvider"
6669
android:authorities="com.example.android.sliceviewer"
6770
android:exported="true">
71+
6872
<intent-filter>
6973
<action android:name="android.intent.action.VIEW" />
70-
7174
<category android:name="android.app.slice.category.SLICE" />
7275

73-
7476
<data
7577
android:host="sliceviewer.android.example.com"
7678
android:pathPrefix="/"

app/src/main/res/layout/activity_single_slice_viewer.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
16+
<androidx.constraintlayout.widget.ConstraintLayout
17+
xmlns:android="http://schemas.android.com/apk/res/android"
1718
xmlns:app="http://schemas.android.com/apk/res-auto"
1819
xmlns:tools="http://schemas.android.com/tools"
1920
android:layout_width="match_parent"
@@ -73,5 +74,4 @@
7374
android:paddingStart="@dimen/margin_small" />
7475
</FrameLayout>
7576
</ScrollView>
76-
7777
</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_slice_viewer.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
limitations under the License.
1515
-->
1616

17-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
17+
<LinearLayout
18+
xmlns:android="http://schemas.android.com/apk/res/android"
1819
xmlns:app="http://schemas.android.com/apk/res-auto"
1920
android:layout_width="match_parent"
2021
android:layout_height="match_parent"

app/src/main/res/layout/slice_row.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
16+
<androidx.constraintlayout.widget.ConstraintLayout
17+
xmlns:android="http://schemas.android.com/apk/res/android"
1718
xmlns:app="http://schemas.android.com/apk/res-auto"
1819
xmlns:tools="http://schemas.android.com/tools"
1920
android:layout_width="match_parent"

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.2.40'
3+
ext.kotlin_version = '1.2.71'
44
repositories {
55
jcenter()
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.0-beta02'
9+
classpath 'com.android.tools.build:gradle:3.2.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

0 commit comments

Comments
 (0)