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

Commit b690683e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12596896 from c444e086 to 25Q2-release 

Change-Id: I8dd20ce624f1ef9cbb365412a67e86176db7a0d7
parents d30ead27 c444e086

compose/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -37,8 +37,10 @@ android_library { 
        "androidx.compose.runtime_runtime",

        "androidx.compose.ui_ui",

        "androidx.core_core-ktx",

        "androidx.hilt_hilt-navigation-compose",

        "androidx.lifecycle_lifecycle-runtime-compose",

        "androidx.lifecycle_lifecycle-runtime-ktx",

        "hilt_android",

        "modules-utils-build_system",

    ],

compose/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>



    <application

        android:name=".DocumentsUIApplication"

        android:label="@string/app_label"

        android:supportsRtl="true"

        android:allowBackup="true"

compose/src/com/android/documentsui/compose/DocumentsUIApplication.kt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 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.

 */



package com.android.documentsui.compose



import android.app.Application

import dagger.hilt.android.HiltAndroidApp



@HiltAndroidApp(Application::class)

class DocumentsUIApplication : Hilt_DocumentsUIApplication()

compose/src/com/android/documentsui/compose/MainActivity.kt

+6 −5
Original line number Diff line number Diff line
@@ -19,15 +19,18 @@ package com.android.documentsui.compose 
import android.os.Bundle

import androidx.activity.ComponentActivity

import androidx.activity.compose.setContent

import androidx.compose.foundation.layout.Column

import androidx.activity.enableEdgeToEdge

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Surface

import androidx.compose.material3.Text

import androidx.compose.ui.Modifier

import dagger.hilt.android.AndroidEntryPoint



class MainActivity : ComponentActivity() {

@AndroidEntryPoint(ComponentActivity::class)

class MainActivity : Hilt_MainActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {

        enableEdgeToEdge()

        super.onCreate(savedInstanceState)



        setContent {
@@ -36,11 +39,9 @@ class MainActivity : ComponentActivity() { 
                    modifier = Modifier.fillMaxSize(),

                    color = MaterialTheme.colorScheme.background

                ) {

                    Column {

                    Text(text = "DocumentsUI Compose")

                }

            }

        }

    }

}
 
}

res/values-bs/inspector_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
    <string name="metadata_altitude" msgid="8063792127436794294">"Visina"</string>

    <string name="metadata_camera" msgid="2363009732801281319">"Kamera"</string>

    <string name="metadata_camera_format" msgid="1494489751904311612">"<xliff:g id="MAKE">%1$s</xliff:g> <xliff:g id="MODEL">%2$s</xliff:g>"</string>

    <string name="metadata_aperture" msgid="6538741952698935357">"Blenda"</string>

    <string name="metadata_aperture" msgid="6538741952698935357">"Otvor blende"</string>

    <string name="metadata_shutter_speed" msgid="8204739885103326131">"Brzina zatvarača"</string>

    <string name="metadata_duration" msgid="3115494422055472715">"Trajanje"</string>

    <string name="metadata_date_time" msgid="1090351199248114406">"Vrijeme snimanja"</string>