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

Commit 588a0881 authored by Jason Monk's avatar Jason Monk
Browse files

Follow-up on comments from splitting app info 

Bug: 19511439
Change-Id: Id1395597262f66514808f71d99978120dbba70e1
parent cd91128a

res/layout/app_preferred_settings.xml

+19 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2015, 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) 2015 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.

-->



<ScrollView

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

    android:layout_width="match_parent"
@@ -44,6 +43,7 @@ 
            android:layout_gravity="center_vertical"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



            <TextView android:id="@+id/auto_launch"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:layout_alignParentStart="true"
@@ -57,6 +57,7 @@ 
                android:layout_below="@id/auto_launch"

                android:paddingTop="4dip"

                android:orientation="horizontal">



                <View

                    android:layout_width="120dip"

                    android:layout_height="0dip"
@@ -72,8 +73,11 @@ 
                    android:layout_height="wrap_content"

                    android:layout_weight="0.4"

                    android:text="@string/clear_activities" />



            </LinearLayout>



        </RelativeLayout>



    </LinearLayout>



</ScrollView>

res/layout/installed_app_details.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
** limitations under the License.

*/

-->



<LinearLayout

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

    android:id="@+id/all_details"

res/layout/permission_settings.xml

+14 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2015, 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) 2015 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.

-->



<ScrollView

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

    android:layout_width="match_parent"

res/layout/storage_settings.xml

+14 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2015, 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) 2015 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.

-->



<ScrollView

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

    android:layout_width="match_parent"

res/values/strings.xml

+12 −12
Original line number Diff line number Diff line
@@ -5923,36 +5923,36 @@ 
   <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>



   <!-- New strings needed for App Info 2 -->

   <!-- Preference label for app default launch settings -->

   <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->

   <string name="launch_by_default">Launch by default</string>



   <!-- Summary for app storage preference -->

   <!-- Summary for app storage preference [CHAR LIMIT=15] -->

   <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>

   <!-- Internal storage label -->

   <!-- Internal storage label [CHAR LIMIT=25] -->

   <string name="storage_type_internal">internal memory</string>

   <!-- External storage label -->

   <!-- External storage label [CHAR LIMIT=25] -->

   <string name="storage_type_external">external memory</string>



   <!-- App notification summary with notifications enabled -->

   <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->

   <string name="notifications_enabled">On</string>

   <!-- App notification summary with notifications disabled -->

   <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->

   <string name="notifications_disabled">Block</string>

   <!-- App notification summary with notifications sensitive -->

   <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->

   <string name="notifications_sensitive">Sensitive</string>

   <!-- App notification summary with notifications priority -->

   <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->

   <string name="notifications_priority">Priority</string>

   <!-- App notification summary with notifications priority and sensitive -->

   <!-- App notification summary with notifications priority and sensitive [CHAR LIMIT=40] -->

   <string name="notifications_priority_sensitive">Priority &amp; Sensitive</string>



   <!-- Permissions preference summary -->

   <!-- Permissions preference summary [CHAR LIMIT=40] -->

   <plurals name="permissions_summary">

       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> permission granted</item>

       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>

   </plurals>



   <!-- Launch defaults preference summary with some set -->

   <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->

   <string name="launch_defaults_some">Some defaults set</string>

   <!-- Launch defaults preference summary with none set -->

   <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->

   <string name="launch_defaults_none">No defaults set</string>



</resources>