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

Commit b6f9152b authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix drawable cache, add quantum assets to preload list 

BUG: 15409352
Change-Id: Idb18fd99dc4229aace9082d6e26c88faf81d15bf
parent 6fbe3982

core/java/android/content/res/Resources.java

+4 −6
Original line number Diff line number Diff line
@@ -2239,9 +2239,7 @@ public class Resources { 
        }



        // First, check whether we have a cached version of this drawable

        // that's valid for the specified theme. This may apply a theme to a

        // cached drawable that has themeable attributes but was not previously

        // themed.

        // that was inflated against the specified theme.

        if (!mPreloading) {

            final Drawable cachedDrawable = getCachedDrawable(caches, key, theme);

            if (cachedDrawable != null) {
@@ -2267,8 +2265,8 @@ public class Resources { 
            dr = loadDrawableForCookie(value, id, theme);

        }



        // If we were able to obtain a drawable, attempt to place it in the

        // appropriate cache (e.g. no theme, themed, themeable).

        // If we were able to obtain a drawable, store it in the appropriate

        // cache (either preload or themed).

        if (dr != null) {

            dr.setChangingConfigurations(value.changingConfigurations);

            cacheDrawable(value, theme, isColorDrawable, caches, key, dr);
@@ -2376,7 +2374,7 @@ public class Resources { 
            ArrayMap<String, LongSparseArray<WeakReference<ConstantState>>> caches,

            long key, Theme theme) {

        synchronized (mAccessLock) {

            final int themeKey = theme != null ? theme.mThemeResId : 0;

            final String themeKey = theme != null ? theme.mKey : "";

            final LongSparseArray<WeakReference<ConstantState>> themedCache = caches.get(themeKey);

            if (themedCache != null) {

                final Drawable themedDrawable = getCachedDrawableLocked(themedCache, key);

core/res/res/values/arrays.xml

+197 −0
Original line number Diff line number Diff line
@@ -298,6 +298,191 @@ 
       <item>@drawable/quickcontact_badge_overlay_light</item>

       <item>@drawable/quickcontact_badge_overlay_normal_light</item>

       <item>@drawable/quickcontact_badge_overlay_pressed_light</item>



       <!-- Quantum assets -->

       <item>@drawable/ab_share_pack_qntm_alpha</item>

       <item>@drawable/ab_solid_shadow_qntm_alpha</item>

       <item>@drawable/btn_cab_done_qntm_alpha</item>

       <item>@drawable/btn_check_to_off_qntm_000</item>

       <item>@drawable/btn_check_to_off_qntm_001</item>

       <item>@drawable/btn_check_to_off_qntm_002</item>

       <item>@drawable/btn_check_to_off_qntm_003</item>

       <item>@drawable/btn_check_to_off_qntm_004</item>

       <item>@drawable/btn_check_to_off_qntm_005</item>

       <item>@drawable/btn_check_to_off_qntm_006</item>

       <item>@drawable/btn_check_to_off_qntm_007</item>

       <item>@drawable/btn_check_to_off_qntm_008</item>

       <item>@drawable/btn_check_to_off_qntm_009</item>

       <item>@drawable/btn_check_to_off_qntm_010</item>

       <item>@drawable/btn_check_to_off_qntm_011</item>

       <item>@drawable/btn_check_to_off_qntm_012</item>

       <item>@drawable/btn_check_to_off_qntm_013</item>

       <item>@drawable/btn_check_to_off_qntm_014</item>

       <item>@drawable/btn_check_to_off_qntm_015</item>

       <item>@drawable/btn_check_to_on_qntm_000</item>

       <item>@drawable/btn_check_to_on_qntm_001</item>

       <item>@drawable/btn_check_to_on_qntm_002</item>

       <item>@drawable/btn_check_to_on_qntm_003</item>

       <item>@drawable/btn_check_to_on_qntm_004</item>

       <item>@drawable/btn_check_to_on_qntm_005</item>

       <item>@drawable/btn_check_to_on_qntm_006</item>

       <item>@drawable/btn_check_to_on_qntm_007</item>

       <item>@drawable/btn_check_to_on_qntm_008</item>

       <item>@drawable/btn_check_to_on_qntm_009</item>

       <item>@drawable/btn_check_to_on_qntm_010</item>

       <item>@drawable/btn_check_to_on_qntm_011</item>

       <item>@drawable/btn_check_to_on_qntm_012</item>

       <item>@drawable/btn_check_to_on_qntm_013</item>

       <item>@drawable/btn_check_to_on_qntm_014</item>

       <item>@drawable/btn_check_to_on_qntm_015</item>

       <item>@drawable/btn_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00000_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00001_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00002_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00003_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00004_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00005_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00006_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00007_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00008_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00009_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00010_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00011_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00012_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00013_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00014_qntm_alpha</item>

       <item>@drawable/btn_radio_anim_00015_qntm_alpha</item>

       <item>@drawable/btn_radio_to_off_qntm_000</item>

       <item>@drawable/btn_radio_to_off_qntm_001</item>

       <item>@drawable/btn_radio_to_off_qntm_002</item>

       <item>@drawable/btn_radio_to_off_qntm_003</item>

       <item>@drawable/btn_radio_to_off_qntm_004</item>

       <item>@drawable/btn_radio_to_off_qntm_005</item>

       <item>@drawable/btn_radio_to_off_qntm_006</item>

       <item>@drawable/btn_radio_to_off_qntm_007</item>

       <item>@drawable/btn_radio_to_off_qntm_008</item>

       <item>@drawable/btn_radio_to_off_qntm_009</item>

       <item>@drawable/btn_radio_to_off_qntm_010</item>

       <item>@drawable/btn_radio_to_off_qntm_011</item>

       <item>@drawable/btn_radio_to_off_qntm_012</item>

       <item>@drawable/btn_radio_to_off_qntm_013</item>

       <item>@drawable/btn_radio_to_off_qntm_014</item>

       <item>@drawable/btn_radio_to_off_qntm_015</item>

       <item>@drawable/btn_radio_to_on_qntm_000</item>

       <item>@drawable/btn_radio_to_on_qntm_001</item>

       <item>@drawable/btn_radio_to_on_qntm_002</item>

       <item>@drawable/btn_radio_to_on_qntm_003</item>

       <item>@drawable/btn_radio_to_on_qntm_004</item>

       <item>@drawable/btn_radio_to_on_qntm_005</item>

       <item>@drawable/btn_radio_to_on_qntm_006</item>

       <item>@drawable/btn_radio_to_on_qntm_007</item>

       <item>@drawable/btn_radio_to_on_qntm_008</item>

       <item>@drawable/btn_radio_to_on_qntm_009</item>

       <item>@drawable/btn_radio_to_on_qntm_010</item>

       <item>@drawable/btn_radio_to_on_qntm_011</item>

       <item>@drawable/btn_radio_to_on_qntm_012</item>

       <item>@drawable/btn_radio_to_on_qntm_013</item>

       <item>@drawable/btn_radio_to_on_qntm_014</item>

       <item>@drawable/btn_radio_to_on_qntm_015</item>

       <item>@drawable/btn_rating_star_off_qntm_alpha</item>

       <item>@drawable/btn_rating_star_on_qntm_alpha</item>

       <item>@drawable/btn_star_qntm_alpha</item>

       <item>@drawable/btn_switch_to_off_qntm_000</item>

       <item>@drawable/btn_switch_to_off_qntm_001</item>

       <item>@drawable/btn_switch_to_off_qntm_002</item>

       <item>@drawable/btn_switch_to_off_qntm_003</item>

       <item>@drawable/btn_switch_to_off_qntm_004</item>

       <item>@drawable/btn_switch_to_off_qntm_005</item>

       <item>@drawable/btn_switch_to_off_qntm_006</item>

       <item>@drawable/btn_switch_to_off_qntm_007</item>

       <item>@drawable/btn_switch_to_off_qntm_008</item>

       <item>@drawable/btn_switch_to_off_qntm_009</item>

       <item>@drawable/btn_switch_to_off_qntm_010</item>

       <item>@drawable/btn_switch_to_off_qntm_011</item>

       <item>@drawable/btn_switch_to_off_qntm_012</item>

       <item>@drawable/btn_switch_to_off_qntm_013</item>

       <item>@drawable/btn_switch_to_off_qntm_014</item>

       <item>@drawable/btn_switch_to_on_qntm_000</item>

       <item>@drawable/btn_switch_to_on_qntm_001</item>

       <item>@drawable/btn_switch_to_on_qntm_002</item>

       <item>@drawable/btn_switch_to_on_qntm_003</item>

       <item>@drawable/btn_switch_to_on_qntm_004</item>

       <item>@drawable/btn_switch_to_on_qntm_005</item>

       <item>@drawable/btn_switch_to_on_qntm_006</item>

       <item>@drawable/btn_switch_to_on_qntm_007</item>

       <item>@drawable/btn_switch_to_on_qntm_008</item>

       <item>@drawable/btn_switch_to_on_qntm_009</item>

       <item>@drawable/btn_switch_to_on_qntm_010</item>

       <item>@drawable/btn_switch_to_on_qntm_011</item>

       <item>@drawable/btn_switch_to_on_qntm_012</item>

       <item>@drawable/btn_switch_to_on_qntm_013</item>

       <item>@drawable/btn_switch_to_on_qntm_014</item>

       <item>@drawable/btn_toggle_indicator_qntm_alpha</item>

       <item>@drawable/btn_toggle_qntm_alpha</item>

       <item>@drawable/expander_close_qntm_alpha</item>

       <item>@drawable/expander_open_qntm_alpha</item>

       <item>@drawable/fastscroll_thumb_qntm_alpha</item>

       <item>@drawable/fastscroll_track_qntm_alpha</item>

       <item>@drawable/ic_ab_back_qntm_am_alpha</item>

       <item>@drawable/ic_cab_done_qntm_alpha</item>

       <item>@drawable/ic_clear_qntm_alpha</item>

       <item>@drawable/ic_commit_search_api_qntm_alpha</item>

       <item>@drawable/ic_dialog_alert_qntm_alpha</item>

       <item>@drawable/ic_find_next_qntm_alpha</item>

       <item>@drawable/ic_find_previous_qntm_alpha</item>

       <item>@drawable/ic_go_search_api_qntm_alpha</item>

       <item>@drawable/ic_media_route_disabled_qntm_alpha</item>

       <item>@drawable/ic_media_route_off_qntm_alpha</item>

       <item>@drawable/ic_media_route_on_0_qntm_alpha</item>

       <item>@drawable/ic_media_route_on_1_qntm_alpha</item>

       <item>@drawable/ic_media_route_on_2_qntm_alpha</item>

       <item>@drawable/ic_media_route_on_qntm_alpha</item>

       <item>@drawable/ic_menu_copy_qntm_am_alpha</item>

       <item>@drawable/ic_menu_cut_qntm_alpha</item>

       <item>@drawable/ic_menu_find_qntm_alpha</item>

       <item>@drawable/ic_menu_moreoverflow_qntm_alpha</item>

       <item>@drawable/ic_menu_paste_qntm_am_alpha</item>

       <item>@drawable/ic_menu_search_qntm_alpha</item>

       <item>@drawable/ic_menu_selectall_qntm_alpha</item>

       <item>@drawable/ic_menu_share_qntm_alpha</item>

       <item>@drawable/ic_search_api_qntm_alpha</item>

       <item>@drawable/ic_voice_search_api_qntm_alpha</item>

       <item>@drawable/list_divider_qntm_alpha</item>

       <item>@drawable/list_section_divider_qntm_alpha</item>

       <item>@drawable/popup_background_qntm_mult</item>

       <item>@drawable/progress_primary_qntm_alpha</item>

       <item>@drawable/progress_qntm_alpha</item>

       <item>@drawable/scrollbar_handle_qntm_alpha</item>

       <item>@drawable/scrubber_control_from_pressed_qntm_000</item>

       <item>@drawable/scrubber_control_from_pressed_qntm_001</item>

       <item>@drawable/scrubber_control_from_pressed_qntm_002</item>

       <item>@drawable/scrubber_control_from_pressed_qntm_003</item>

       <item>@drawable/scrubber_control_from_pressed_qntm_004</item>

       <item>@drawable/scrubber_control_from_pressed_qntm_005</item>

       <item>@drawable/scrubber_control_off_pressed_qntm_alpha</item>

       <item>@drawable/scrubber_control_off_qntm_alpha</item>

       <item>@drawable/scrubber_control_on_pressed_qntm_alpha</item>

       <item>@drawable/scrubber_control_on_qntm_alpha</item>

       <item>@drawable/scrubber_control_to_pressed_qntm_000</item>

       <item>@drawable/scrubber_control_to_pressed_qntm_001</item>

       <item>@drawable/scrubber_control_to_pressed_qntm_002</item>

       <item>@drawable/scrubber_control_to_pressed_qntm_003</item>

       <item>@drawable/scrubber_control_to_pressed_qntm_004</item>

       <item>@drawable/scrubber_control_to_pressed_qntm_005</item>

       <item>@drawable/scrubber_primary_qntm_alpha</item>

       <item>@drawable/scrubber_track_qntm_alpha</item>

       <item>@drawable/spinner_qntm_am_alpha</item>

       <item>@drawable/switch_track_qntm_alpha</item>

       <item>@drawable/tab_indicator_normal_qntm_alpha</item>

       <item>@drawable/tab_indicator_selected_qntm_alpha</item>

       <item>@drawable/text_cursor_qntm_alpha</item>

       <item>@drawable/textfield_activated_qntm_alpha</item>

       <item>@drawable/textfield_default_qntm_alpha</item>

       <item>@drawable/textfield_search_activated_qntm_alpha</item>

       <item>@drawable/textfield_search_default_qntm_alpha</item>

       <item>@drawable/text_select_handle_left_qntm_alpha</item>

       <item>@drawable/text_select_handle_middle_qntm_alpha</item>

       <item>@drawable/text_select_handle_right_qntm_alpha</item>

    </array>



    <!-- Do not translate. These are all of the color state list resources that should be
@@ -334,6 +519,18 @@ 
        <item>#ff000000</item>

        <item>#00000000</item>

        <item>#ffffffff</item>



        <!-- Quantum color state lists -->

       <item>@color/background_cache_hint_selector_quantum_dark</item>

       <item>@color/background_cache_hint_selector_quantum_light</item>

       <item>@color/btn_default_quantum_dark</item>

       <item>@color/btn_default_quantum_light</item>

       <item>@color/primary_text_disable_only_quantum_dark</item>

       <item>@color/primary_text_disable_only_quantum_light</item>

       <item>@color/primary_text_quantum_dark</item>

       <item>@color/primary_text_quantum_light</item>

       <item>@color/search_url_text_quantum_dark</item>

       <item>@color/search_url_text_quantum_light</item>

    </array>



    <!-- Used in LocalePicker -->