Merge Android 13 QPR2android-u-beta-1-gpl

Bug: 273316506
Merged-In: Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f
Change-Id: I1194cf6d5efb45e7c6aa69aa1234ebc599be32c6

1 files changed, 6 insertions, 3 deletions

diff --git a/ktfmt.py b/ktfmt.py
index 6f115f7..3d337bb 100755
--- a/ktfmt.py
+++ b/ktfmt.py
@@ -108,10 +108,13 @@ def main():
           '**********************************************************************'
       )
       print(
-          'Some Kotlin files are not properly formatted. Run the following command to format them:\n\n'
-      )
+          'Some Kotlin files are not properly formatted. Run the command below to format them.\n'
+          'Note: If you are using the Android Studio ktfmt plugin, make sure to select the '
+          'Kotlinlang style in \'Editor > ktfmt Settings\'.\n')
       script_path = os.path.normpath(__file__)
-      incorrect_files = stdout.decode('utf-8').splitlines()
+      incorrect_files = [
+          os.path.abspath(file) for file in stdout.decode('utf-8').splitlines()
+      ]
       print('$ ' + script_path + ' ' + ' '.join(incorrect_files) + '\n')
       print(
           '**********************************************************************'