From 7a2459ca13c42ae3f3e07d43b671e78d5c4939c7 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Sun, 6 May 2018 20:46:17 -0700 Subject: Merge java-overridable/ into java/ again This CL a logical revert of a previous CL [1], which separated Java files into common ones and overridable ones. Now that that overriding concept is no longer used, there is no need to keep having separate directory structure. [1]: Ic734bd4d20aa050c688a3158b1a382ae0ac18991 fb74ab15c1343084740d65ef8744cad33a678e82 Fix: 79323502 Test: make -j aosp_taimen-userdebug && make -j Test: tapas LatinIME && make -j Change-Id: I2090bc25d18e6d4f24e91c2cbfe832755cbb4e8f --- .../dictionarypack/MetadataUriGetter.java | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java (limited to 'java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java') diff --git a/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java b/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java deleted file mode 100644 index 512d426aa..000000000 --- a/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2013 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 com.android.inputmethod.dictionarypack; - -import android.content.Context; - -/** - * Helper to get the metadata URI from its base URI. - */ -@SuppressWarnings("unused") -public class MetadataUriGetter { - public static String getUri(final Context context, final String baseUri) { - return baseUri; - } -} -- cgit v1.2.3-83-g751a