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

Commit eaf1c10e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[RESTRICT AUTOMERGE] Move Theme::Entry definition to top of file" into main

parents 8116bce1 e8e793a3

libs/androidfw/AssetManager2.cpp

+7 −7
Original line number Diff line number Diff line
@@ -99,6 +99,13 @@ struct FindEntryResult { 
  StringPoolRef entry_string_ref;

};



struct Theme::Entry {

  uint32_t attr_res_id;

  ApkAssetsCookie cookie;

  uint32_t type_spec_flags;

  Res_value value;

};



AssetManager2::AssetManager2() {

  memset(&configuration_, 0, sizeof(configuration_));

}
@@ -1411,13 +1418,6 @@ Theme::Theme(AssetManager2* asset_manager) : asset_manager_(asset_manager) { 


Theme::~Theme() = default;



struct Theme::Entry {

  uint32_t attr_res_id;

  ApkAssetsCookie cookie;

  uint32_t type_spec_flags;

  Res_value value;

};



namespace {

struct ThemeEntryKeyComparer {

  bool operator() (const Theme::Entry& entry, uint32_t attr_res_id) const noexcept {