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

Commit 5eee63fa authored by Chris Antol's avatar Chris Antol Committed by Android (Google) Code Review
Browse files

Merge "Support Storage App List in Catalyst" into main

parents 466b5ed8 e78766c3

packages/SettingsLib/Graph/graph.proto

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ message PreferenceValueProto { 
    bool boolean_value = 1;

    int32 int_value = 2;

    float float_value = 3;

    int64 long_value = 4;

  }

}
@@ -148,6 +149,7 @@ message PreferenceValueDescriptorProto { 
    bool boolean_type = 1;

    RangeValueProto range_value = 2;

    bool float_type = 3;

    bool long_type = 4;

  }

}

packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ fun PreferenceMetadata.toProto( 
                    storage.getBoolean(metadata.key)?.let { booleanValue = it }

                Float::class.javaObjectType ->

                    storage.getFloat(metadata.key)?.let { floatValue = it }

                Long::class.javaObjectType -> storage.getLong(metadata.key)?.let { longValue = it }

                else -> {}

            }

        }
@@ -458,6 +459,7 @@ fun PreferenceMetadata.toProto( 
            when (metadata.valueType) {

                Boolean::class.javaObjectType -> booleanType = true

                Float::class.javaObjectType -> floatType = true

                Long::class.javaObjectType -> longType = true

            }

        }

    }