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

Commit

Permalink
Update library version and clean up XML.
Browse files Browse the repository at this point in the history
Bug: 117618327
Test: Manually tested.
Change-Id: I395f98932ff0aa5a99af017dd64abfaa9f013078
  • Loading branch information
Jeremy Walker authored and Jeremy Walker committed Oct 15, 2018
1 parent 3f82973 commit c6d5cb3
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 19 deletions.
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ repositories {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "androidx.lifecycle:lifecycle-runtime:2.0.0-rc01"
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0-rc01"
implementation "androidx.lifecycle:lifecycle-common:2.0.0-rc01"
implementation "androidx.slice:slice-view:1.0.0-rc02"
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha5"
implementation "androidx.appcompat:appcompat:1.0.0-rc02"
implementation "androidx.cardview:cardview:1.0.0-rc02"
implementation "androidx.core:core-ktx:1.0.0-rc02"
implementation "androidx.lifecycle:lifecycle-runtime:2.0.0"
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
implementation "androidx.lifecycle:lifecycle-common:2.0.0"
implementation "androidx.slice:slice-view:1.0.0"
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha6"
implementation "androidx.appcompat:appcompat:1.0.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.core:core-ktx:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
}

Expand Down
12 changes: 7 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,35 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">

<activity
android:name=".ui.list.SliceViewerActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

<intent-filter>
<action android:name="androidx.intent.SLICE_ACTION" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".ui.single.SingleSliceViewerActivity"
android:exported="true"
android:label="@string/single_slice_viewer_activity"
android:theme="@style/AppTheme">

<intent-filter>
<action android:name="androidx.intent.SLICE_ACTION" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.VIEW" />

Expand All @@ -65,12 +68,11 @@
android:name=".provider.SampleSliceProvider"
android:authorities="com.example.android.sliceviewer"
android:exported="true">

<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.app.slice.category.SLICE" />


<data
android:host="sliceviewer.android.example.com"
android:pathPrefix="/"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_single_slice_viewer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
Expand Down Expand Up @@ -73,5 +74,4 @@
android:paddingStart="@dimen/margin_small" />
</FrameLayout>
</ScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_slice_viewer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
limitations under the License.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/slice_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.2.40'
ext.kotlin_version = '1.2.71'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0-beta02'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down

0 comments on commit c6d5cb3

Please sign in to comment.