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

Commit f5c64d41 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "revert-33442621-revert-33413727-Spa-search-converter-FBFNSWREQE-BZKTLCOIHH" into main

* changes:
  Revert^2 "Create Spa search converters"
  Revert^2 "Create Spa-search lib"
parents 1625a7c0 69e5b4d1

packages/SettingsLib/Spa/Android.bp

0 → 100644
+19 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2025 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 {

    default_team: "trendy_team_pixel_setting_exp",

}

packages/SettingsLib/Spa/search/Android.bp

0 → 100644
+35 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2025 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 {

    default_applicable_licenses: ["frameworks_base_license"],

}



android_library {

    name: "Spa-search",

    srcs: ["src/**/*.kt"],

    use_resource_processor: true,

    static_libs: [

        "SettingsLib-search",

        "SpaLib",

        "Spa-search-protos-lite",

    ],

    kotlincflags: [

        "-Xjvm-default=all",

    ],

    sdk_version: "system_current",

    min_sdk_version: "31",

}

packages/SettingsLib/Spa/search/AndroidManifest.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2025 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.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.settingslib.spa.search">

    <uses-sdk android:minSdkVersion="31" />

</manifest>

packages/SettingsLib/Spa/search/proto/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2025 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 {

    default_applicable_licenses: ["frameworks_base_license"],

}



java_library {

    name: "Spa-search-protos-lite",

    proto: {

        type: "lite",

    },

    srcs: ["*.proto"],

}

packages/SettingsLib/Spa/search/proto/spa_search_landing.proto

0 → 100644
+48 −0
Original line number Diff line number Diff line 
// Copyright (C) 2025 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.



syntax = "proto2";



package com.android.settingslib.spa.search;



message SpaSearchLandingKey {

  oneof page {

    SpaSearchLandingSpaPage spa_page = 1;

    SpaSearchLandingFragment fragment = 2;

  }

}



message SpaSearchLandingSpaPage {

  /** The destination of SPA page. */

  optional string destination = 1;

}



message SpaSearchLandingFragment {

  /** The fragment class name. */

  optional string fragment_name = 1;



  /** The key of the preference to highlight the item. */

  optional string preference_key = 2;



  /** The arguments passed to the page. */

  map<string, BundleValue> arguments = 3;

}



/** A value in an Android Bundle. */

message BundleValue {

  oneof value {

    /** A 32-bit signed integer value. */

    int32 int_value = 1;

  }

}