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

Commit c2f80e67 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'remotes/goog/donut' into donut-release

parents 23665c94 02cd147c

include/utils/ResourceTypes.h

+2 −1
Original line number Diff line number Diff line
@@ -825,7 +825,8 @@ struct ResTable_config 
    };

    

    enum {

        DENSITY_ANY = 0

        DENSITY_DEFAULT = 0,

        DENSITY_NONE = 0xffff

    };

    

    union {

libs/utils/ResourceTypes.cpp

+11 −2
Original line number Diff line number Diff line
@@ -4007,7 +4007,16 @@ void ResTable::print(bool inclValues) const 
                        printf("      NON-INTEGER ResTable_type ADDRESS: %p\n", type);

                        continue;

                    }

                    printf("      config %d lang=%c%c cnt=%c%c orien=%d touch=%d density=%d key=%d infl=%d nav=%d w=%d h=%d lyt=%d\n",

                    char density[16];

                    uint16_t dval = dtohs(type->config.density);

                    if (dval == ResTable_config::DENSITY_DEFAULT) {

                        strcpy(density, "def");

                    } else if (dval == ResTable_config::DENSITY_NONE) {

                        strcpy(density, "non");

                    } else {

                        sprintf(density, "%d", (int)dval);

                    }

                    printf("      config %d lang=%c%c cnt=%c%c orien=%d touch=%d density=%s key=%d infl=%d nav=%d w=%d h=%d lyt=%d\n",

                           (int)configIndex,

                           type->config.language[0] ? type->config.language[0] : '-',

                           type->config.language[1] ? type->config.language[1] : '-',
@@ -4015,7 +4024,7 @@ void ResTable::print(bool inclValues) const 
                           type->config.country[1] ? type->config.country[1] : '-',

                           type->config.orientation,

                           type->config.touchscreen,

                           dtohs(type->config.density),

                           density,

                           type->config.keyboard,

                           type->config.inputFlags,

                           type->config.navigation,