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

Commit a4ff00f7 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Mechanical refactoring to use public annotations. 

We're making an effort to get DocumentsUI to build against public API,
so move toward use "androidx" annotations from the support library.

Purely mechanical refactoring with "sed".

Test: builds
Bug: 110959821
Change-Id: I378f5a29620f8f5a6046109ca1aa17d9e18e725f
parent 5b225532

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := DocumentsUI

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
@@ -35,7 +34,6 @@ LOCAL_SRC_FILES := \ 
        minimal/src/com/android/documentsui/picker/DummyPickActivity.java



LOCAL_PACKAGE_NAME := DocumentsUIMinimal

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/minimal/res

LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/minimal/AndroidManifest.xml

build_apk.mk

+4 −0
Original line number Diff line number Diff line
@@ -25,4 +25,8 @@ endif 
LOCAL_CERTIFICATE := platform

LOCAL_PROGUARD_FLAG_FILES := proguard.flags



# TODO: build against public API as part of b/110959821

LOCAL_PRIVATE_PLATFORM_APIS := true

#LOCAL_SDK_VERSION := current



include $(BUILD_PACKAGE)

src/com/android/documentsui/AbstractDragHost.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.documentsui;



import android.annotation.CallSuper;

import androidx.annotation.CallSuper;

import android.view.View;



import com.android.documentsui.services.FileOperationService;

src/com/android/documentsui/ActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.documentsui;



import android.annotation.IntDef;

import androidx.annotation.IntDef;

import android.app.PendingIntent;

import android.content.ContentProvider;

import android.content.Intent;

src/com/android/documentsui/ActionModeController.java

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.documentsui; 


import static com.android.documentsui.base.SharedMinimal.DEBUG;



import android.annotation.IdRes;

import android.annotation.Nullable;

import androidx.annotation.IdRes;

import androidx.annotation.Nullable;

import android.app.Activity;

import android.text.TextUtils;

import android.util.Log;