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

Commit 7f395011 authored by Steve McKay's avatar Steve McKay
Browse files

Use resource aliases in-lieu of ViewStubs. 

This eliminates the double resource inflation necsesitated by the use of ViewStubs.

Change-Id: I9749356bed24f48b8304897dc6d8dc47cc11736c
parent 5fe2f39b

res/layout-sw720dp/activity.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 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.

-->



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

    android:id="@+id/stub"

    android:inflatedId="@+id/drawer_layout"

    android:layout="@layout/drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

res/layout/activity.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 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.

-->



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

    android:id="@+id/stub"

    android:inflatedId="@+id/drawer_layout"

    android:layout="@layout/drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

res/layout-sw720dp-land/files_activity.xml→res/values-sw720dp-land/layouts.xml

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

-->



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

    android:id="@+id/stub"

    android:inflatedId="@+id/fixed_layout"

    android:layout="@layout/fixed_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />
 
<resources>

    <item name="files_activity" type="layout">@layout/fixed_layout</item>

</resources>

res/layout/files_activity.xml→res/values-sw720dp/layouts.xml

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

-->



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

    android:id="@+id/stub"

    android:inflatedId="@+id/drawer_layout"

    android:layout="@layout/drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />
 
<resources>

    <item name="docs_activity" type="layout">@layout/fixed_layout</item>

</resources>

res/layout-sw720dp/files_activity.xml→res/values/layouts.xml

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

-->



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

    android:id="@+id/stub"

    android:inflatedId="@+id/drawer_layout"

    android:layout="@layout/drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />
 
<resources>

    <item name="docs_activity" type="layout">@layout/drawer_layout</item>

    <item name="files_activity" type="layout">@layout/drawer_layout</item>

</resources>