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

Commit 4cbf5efd authored by Chris Craik's avatar Chris Craik
Browse files

Add tests for text layout cache 

Change-Id: I605391de1e0772821dd2a5ad6f829aea1f63c25b
parent f31cced1

tests/UiBench/AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -121,5 +121,21 @@ 
                <category android:name="com.android.test.uibench.TEST" />

            </intent-filter>

        </activity>

        <activity

            android:name=".TextCacheLowHitrateActivity"

            android:label="Text/Layout Cache Low Hitrate" >

            <intent-filter>

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

                <category android:name="com.android.test.uibench.TEST" />

            </intent-filter>

        </activity>

        <activity

            android:name=".TextCacheHighHitrateActivity"

            android:label="Text/Layout Cache High Hitrate" >

            <intent-filter>

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

                <category android:name="com.android.test.uibench.TEST" />

            </intent-filter>

        </activity>

    </application>

</manifest>

tests/UiBench/src/com/android/test/uibench/CompatListActivity.java

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

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

 */

package com.android.test.uibench;



import android.os.Bundle;

import android.support.v4.app.FragmentManager;

import android.support.v4.app.ListFragment;

import android.support.v7.app.AppCompatActivity;

import android.widget.ListAdapter;



public abstract class CompatListActivity extends AppCompatActivity {



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        FragmentManager fm = getSupportFragmentManager();

        if (fm.findFragmentById(android.R.id.content) == null) {

            ListFragment listFragment = new ListFragment();

            listFragment.setListAdapter(createListAdapter());

            fm.beginTransaction().add(android.R.id.content, listFragment).commit();

        }

    }



    protected abstract ListAdapter createListAdapter();

}

tests/UiBench/src/com/android/test/uibench/DialogListActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class DialogListActivity extends AppCompatActivity { 


        ListView listView = new ListView(this);

        listView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1,

                TrivialListActivity.buildStringList()));

                TextUtils.buildSimpleStringList()));



        AlertDialog.Builder builder = new AlertDialog.Builder(this);

        builder.setTitle("Dialog");

tests/UiBench/src/com/android/test/uibench/InflatingListActivity.java

+4 −19
Original line number Diff line number Diff line
@@ -15,19 +15,16 @@ 
 */

package com.android.test.uibench;



import android.os.Bundle;

import android.support.v4.app.FragmentManager;

import android.support.v4.app.ListFragment;

import android.support.v7.app.AppCompatActivity;

import android.view.View;

import android.view.ViewGroup;

import android.widget.ArrayAdapter;

import android.widget.ListAdapter;



public class InflatingListActivity extends AppCompatActivity {

    private ListAdapter createListAdapter() {

public class InflatingListActivity extends CompatListActivity {

    @Override

    protected ListAdapter createListAdapter() {

        return new ArrayAdapter<String>(this,

                android.R.layout.simple_list_item_1, TrivialListActivity.buildStringList()) {

                android.R.layout.simple_list_item_1, TextUtils.buildSimpleStringList()) {

            @Override

            public View getView(int position, View convertView, ViewGroup parent) {

                // pathological getView behavior: drop convertView on the floor to force inflation
@@ -35,16 +32,4 @@ public class InflatingListActivity extends AppCompatActivity { 
            }

        };

    }



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        FragmentManager fm = getSupportFragmentManager();

        if (fm.findFragmentById(android.R.id.content) == null) {

            ListFragment listFragment = new ListFragment();

            listFragment.setListAdapter(createListAdapter());

            fm.beginTransaction().add(android.R.id.content, listFragment).commit();

        }

    }

}

tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class ShadowGridActivity extends AppCompatActivity { 
            };



            listFragment.setListAdapter(new ArrayAdapter<>(this,

                    R.layout.card_row, R.id.card_text, TrivialListActivity.buildStringList()));

                    R.layout.card_row, R.id.card_text, TextUtils.buildSimpleStringList()));

            fm.beginTransaction().add(android.R.id.content, listFragment).commit();

        }

    }