Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a51466 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Rename SpaLib Codelab to SpaLib Gallery"

parents 2a2f1a0e 06337e4b

packages/SettingsLib/Spa/codelab/Android.bp→packages/SettingsLib/Spa/gallery/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package { 
}



android_app {

    name: "SpaLibCodelab",

    name: "SpaLibGallery",



    srcs: ["src/**/*.kt"],

packages/SettingsLib/Spa/codelab/AndroidManifest.xml→packages/SettingsLib/Spa/gallery/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 
  limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.settingslib.spa.codelab">

    package="com.android.settingslib.spa.gallery">



    <application

        android:label="@string/app_name"

        android:supportsRtl="true"

        android:theme="@style/Theme.SpaLib.DayNight">

        <activity

            android:name="com.android.settingslib.spa.codelab.MainActivity"

            android:name="com.android.settingslib.spa.gallery.MainActivity"

            android:exported="true">

            <intent-filter>

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

packages/SettingsLib/Spa/codelab/build.gradle→packages/SettingsLib/Spa/gallery/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ plugins { 
}



android {

    namespace 'com.android.settingslib.spa.codelab'

    namespace 'com.android.settingslib.spa.gallery'

    compileSdk 33



    defaultConfig {

        applicationId "com.android.settingslib.spa.codelab"

        applicationId "com.android.settingslib.spa.gallery"

        minSdk spa_min_sdk

        targetSdk 33

        versionCode 1

packages/SettingsLib/Spa/codelab/res/values/strings.xml→packages/SettingsLib/Spa/gallery/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
  limitations under the License.

  -->

<resources>

    <!-- Codelab App name. [DO NOT TRANSLATE] -->

    <string name="app_name" translatable="false">SpaLib Codelab</string>

    <!-- Gallery App name. [DO NOT TRANSLATE] -->

    <string name="app_name" translatable="false">SpaLib Gallery</string>

</resources>

packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/MainActivity.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/MainActivity.kt

+3 −3
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
 * limitations under the License.

 */



package com.android.settingslib.spa.codelab

package com.android.settingslib.spa.gallery



import com.android.settingslib.spa.codelab.page.codelabPageRepository

import com.android.settingslib.spa.framework.SpaActivity

import com.android.settingslib.spa.gallery.page.galleryPageRepository



class MainActivity : SpaActivity(codelabPageRepository)
 
class MainActivity : SpaActivity(galleryPageRepository)