Commit Graph

3813 Commits

Author SHA1 Message Date
Xin Li
c081864bf3 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I9b94d270148d8ce5fa97f88f460d8c03eac3873c
Change-Id: I34852886e6e98d2964318d6fcc6ebd7292e47544
2022-02-11 06:56:24 +00:00
Bob Badour
082705bfb3 Fix license texts.
Push specific licenses down the tree toward the leaf directories.

Remove extra Apache 2.0 license texts--just use Android-Apache-2.0

Test: m nothing
Change-Id: Ibee25f75f5933699d6f43acdc192b2ada6823757
2022-01-20 19:04:52 +00:00
Ming-Shin Lu
d45b8f1d4f Using IME context to inflate layout from S_V2 am: e0caa3b4af
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16600245

Change-Id: I73a467cff499f9e2a239d375b50b0ce803479fd1
2022-01-11 17:23:18 +00:00
Ming-Shin Lu
e0caa3b4af Using IME context to inflate layout from S_V2
With CL[1],[2] to migrate InputMethodService as the subclass of the new
introduced class WindowProviderService in S_V2, IME context resources
can be managed by associating the window container of IME window when
its display/window configuration changed.

So in SoftKeyboard#getDisplayContext, we can get rid of
createDisplayContext logic from S_V2 with gated by SDK version and
refining the method documentation to make it clear.

[1]: Ie565e30ed5dd3f2cfe27355a6dded76dc3adc14b
[2]: I64a1614f32d097785915f6105b1813a929e0fe32

Bug: 213118079
Bug: 133825283
Test: manual with below steps
    1) adb install -r EditTextVariations.apk
    2) adb install -r SoftKeyboard.apk
    3) adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
    4) adb shell ime set com.example.android.softkeyboard/.SoftKeyboard5
    5) Enable screen auto-rotation
    6) Launch EditTextVariations from launcher's shortcut
    7) Tap the first EditText field to show IME
    8) Rotate the device to the landscape mode
    9) Expect the IME should not be shrunk

Change-Id: I9a512a90ca43f07236a041d9e82dbd875206f99e
2022-01-10 23:42:17 +08:00
Treehugger Robot
62ce42ad0a Merge "Update lint baseline for AutofillKeyboard" 2021-12-03 16:26:41 +00:00
Colin Cross
e915cf2a80 Update lint baseline for AutofillKeyboard
The new lint version finds more NewApi errors.

Test: m lint-check
Change-Id: I190bbf97000312dc4911552594374d36d8782d7b
2021-09-20 11:56:38 -07:00
Aurimas Liutikas
33be7cbcbe Add explicit exported tags
Bug: 195988762
Test: make javac-check
Change-Id: Ifd07672da0141c74ad32613a17691c6cd09e54de
Merged-In: Ifd07672da0141c74ad32613a17691c6cd09e54de
(cherry picked from commit 7512a62755)
2021-09-14 11:09:20 -07:00
Anton Hansson
cf4b9a604d Merge "Add sdk extension version info to prop templates" 2021-09-01 09:00:15 +00:00
Anton Hansson
48c492ed9f Add sdk extension version info to prop templates
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
  that the ApiLevel shipped with (true), or if is an extension SDK
  release (false).

While we're here, dedupe the recipe that processes these templates.

Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      and inspect the substitution is working
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
(cherry picked from commit cf2f42c36b7997e9ce87682bb3a5511bdb72936f)
2021-08-31 17:42:12 +00:00
Bo Hu
95e1a86c7f Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: Ie6b4595ffaf9c889f9ce363e08098db15823a2fb
2021-08-26 18:38:42 +00:00
Bo Hu
a7fbe75b82 Merge "Cube 3d live Wallpaper can't be set on android 11" 2021-08-26 17:33:36 +00:00
Anton Hansson
b6edd7aa51 Add sdk extension version info to prop templates
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
  that the ApiLevel shipped with (true), or if is an extension SDK
  release (false).

While we're here, dedupe the recipe that processes these templates.

Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      and inspect the substitution is working
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
2021-08-26 17:11:15 +01:00
Yuntao Xu
cc5ca54b05 Merge "Convert Levels/Android.mk to Android.bp" am: ec91659823 am: 7c7034f02a
Original change: https://android-review.googlesource.com/c/platform/development/+/1709407

Change-Id: I690b09534e94577dcc91686789678efe58e004e9
2021-07-28 18:29:17 +00:00
Yuntao Xu
ec91659823 Merge "Convert Levels/Android.mk to Android.bp" 2021-07-28 17:56:13 +00:00
Yuntao Xu
2ab71a2936 Convert Levels/Android.mk to Android.bp
1. converted the Make file to a Soong one;
2. handled the .rscript files by genrule (to include the same commands used when build
with the former .mk file);
3. the differences observed in the apks before and after the conversion
are the same as in http://b/192521178, which should not affect the
conversion here;
4. the same result was observed when run the two apks on a physical
phone(Pixel 3a XL (bonito));
5. test commands:
mma -j LevelsRS
adb install -r ~/aosp/out/target/product/bonito/system/app/LevelsRS/LevelsRS.apk
adb shell am start -S -n com.android.rs.levels/.LevelsRSActivity
adb shell am start -S -n com.android.rs.levels/.LevelsDalvikActivity

Bug: 124261647
Test: compared the two apk files built by Make and Soong
Test: run two apks on a Pixel 3a XL (bonito) phone
Test: TreeHugger
Change-Id: I93876654215de98ec3160912676589ae143a4071
2021-07-26 19:25:52 +00:00
Yuntao Xu
b8d0a3a9fa Merge "Convert HelloCompute/Android.mk to Android.bp" am: 287e52bff6 am: 1185764fe4
Original change: https://android-review.googlesource.com/c/platform/development/+/1711177

Change-Id: Ic6fb03d83685ddf7103362f0100a65ec82cda9ab
2021-07-23 18:23:51 +00:00
Yuntao Xu
4945a032a0 Convert HelloCompute/Android.mk to Android.bp
1. converted the Make file to a Soong one;
2. handled the .rscript files by genrule (to include the same commands used when build
with the former .mk file);
3. the differences observed in the apks before and after the conversion
are the same as in http://b/186244109, which should not affect the
conversion here;
4. the same result was observed when run the two apks on a physical
phone(Pixel 3a XL (bonito));
5. test commands:
mma -j RsHelloCompute
adb install -r ~/aosp/out/target/product/bonito/system/app/RsHelloCompute/RsHelloCompute.apk
adb shell am start -S -n com.example.android.rs.hellocompute/.HelloCompute

Bug: 124261647
Test: compared the two apk files built by Make and Soong
Test: run two apks on a Pixel 3a XL (bonito) phone
Test: TreeHugger
Change-Id: I93a536ccedd9abe5ceb99d73d96668f0a861fb51
2021-07-22 16:25:28 -07:00
Hongwei Wang
e60d337804 Merge "Use FixedAspectRatioImageView to demo auto-enter-pip" into sc-dev am: 0e4d25a19e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15055021

Change-Id: Idc4f1d75aae9c5e6aeb493c9585c9215cd282d2c
2021-07-15 00:07:30 +00:00
Hongwei Wang
31c5071a72 Use FixedAspectRatioImageView to demo auto-enter-pip
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bpKcGg1eoOo5Jz5U6IwBYK
Bug: 191310680
Test: manually auto-enter-pip from landscape, see video
Change-Id: I30a728331f0ffa48c537be7b2611dba0b2df053a
2021-07-12 16:07:23 -07:00
Yuntao Xu
0f12207fa2 Merge "Convert Android.mk to Android.bp" 2021-06-23 21:19:46 +00:00
Yuntao Xu
7a80636fa6 Merge "Convert Android.mk to Android.bp" into sc-dev-plus-aosp 2021-06-23 18:06:36 +00:00
Yuntao Xu
e6ce052eaa Merge "Convert UiAutomator/Android.mk to Android.bp" am: 34c918d55b am: 68c0d71fb3
Original change: https://android-review.googlesource.com/c/platform/development/+/1715514

Change-Id: I6bc54933df1488e030603a25139953b85ef29e7c
2021-05-26 00:44:58 +00:00
Yuntao Xu
34c918d55b Merge "Convert UiAutomator/Android.mk to Android.bp" 2021-05-26 00:10:23 +00:00
Colin Cross
86786ee8ae Update lint baseline for AutofillKeyboard
An androidx update triggered some NewApi errors.

Bug: 189179560
Test: m out/soong/.intermediates/development/samples/AutofillKeyboard/AutofillKeyboard/android_common/lint/lint-report.html
Change-Id: I219130d6f8ee791566ddeb4542a52225f124500d
2021-05-25 08:11:26 -07:00
Nikita Dubrovsky
0eac02491d Merge "Update ReceiveContentDemo to follow the API docs for URI permissions" into sc-dev 2021-05-22 05:06:06 +00:00
Yuntao Xu
d690d16db5 Convert UiAutomator/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 188694412
Test: compared the two jar files built by Make and Soong
Test: TreeHugger
Change-Id: I84b6e1311d0e35d4bce1c86d9c6eff1ce051c7f8
2021-05-20 17:41:05 -07:00
Nikita Dubrovsky
522bfd9e79 Update ReceiveContentDemo to follow the API docs for URI permissions
Bug: 186122267
Test: Manual
Change-Id: I2720a5856222220849502ccc017a9c8c22f23fd4
2021-05-19 22:30:25 -07:00
Yuntao Xu
aba34f50cc Convert Android.mk to Android.bp
1. Convert ApiDemos/Android.mk to ApiDemos/Android.bp;
2. Convert ApiDemos/tests/Android.mk to ApiDemos/tests/Android.bp

Bug: 186778349
Test: compared the apk files built by Make and Soong
Test: TreeHugger
Change-Id: I7b72a998b56804e647d0908be5a118f9bf2cd896
2021-05-18 23:08:25 -07:00
Yuntao Xu
49de3c50b5 Convert Android.mk to Android.bp
1. Convert ApiDemos/Android.mk to ApiDemos/Android.bp;
2. Convert ApiDemos/tests/Android.mk to ApiDemos/tests/Android.bp

Bug: 186778349
Test: compared the apk files built by Make and Soong
Test: TreeHugger
Change-Id: I7b72a998b56804e647d0908be5a118f9bf2cd896
Merged-In: I7b72a998b56804e647d0908be5a118f9bf2cd896
2021-05-14 12:30:19 -07:00
Hongwei Wang
d1cc26450c Fix flicker in ApiDemos when auto enter PiP from landscape
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/cNwi8qI0qukRlaIwutzclD
Bug: 179720719
Test: auto enter PiP from landscape using ApiDemos app, see video
Change-Id: Ic421b3766fbc15bf699885863710a14c3178867f
2021-05-12 19:39:23 -07:00
TreeHugger Robot
77261d6571 Merge "Adding singleInstancePerTask type activity in IntentPlayground" into sc-dev 2021-05-04 05:43:55 +00:00
Jeff Chang
193d1ded11 Adding singleInstancePerTask type activity in IntentPlayground
Bug: 187124445
Test: build
Change-Id: I684a9327267273efd7a19df0f0897e597c10543d
2021-05-04 11:38:16 +08:00
Nikita Dubrovsky
7bbcbefdda Merge "Update demo app for content insertion to save & display images" into sc-dev 2021-05-03 23:09:10 +00:00
Nikita Dubrovsky
132d5ebd30 Update demo app for content insertion to save & display images
Bug: 186892438
Test: Manual
Change-Id: I8aed85cfeaabdfa5558d11822d156fb84388b1cf
2021-04-30 16:16:39 -07:00
Yuntao Xu
59dd88d490 Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4 am: 7dfe30b1ae
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I626f0bc2b8410b0276f5aa204e8b13e26c7c2236
2021-04-30 17:50:00 +00:00
Yuntao Xu
6d94d1116b Merge "Convert Android.mk to Android.bp" am: 64b8511941 am: 880a6ba188 am: 859f63e840
Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I713c1a354f33d6fc9e6d140d309c4b8e728c50a2
2021-04-30 17:49:56 +00:00
Yuntao Xu
8ce6b456d6 Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff am: c84d747f03 am: bc9b86f776
Original change: https://android-review.googlesource.com/c/platform/development/+/1691912

Change-Id: I5dd79d72b5f412f6c1b62e258520b20706342a0a
2021-04-30 17:49:47 +00:00
Yuntao Xu
b0c776c35d Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 am: 825c1c2b43
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910

Change-Id: I7db13780c88857d0197d71d4d36aa2bbc9fd4910
2021-04-30 17:47:01 +00:00
Yuntao Xu
9e504cc4c5 Merge "Convert MultiDisplay/Android.mk to Android.bp" 2021-04-30 17:04:08 +00:00
Yuntao Xu
64b8511941 Merge "Convert Android.mk to Android.bp" 2021-04-30 17:03:49 +00:00
Yuntao Xu
e281d79cff Merge "Convert IntentPlayground/Android.mk to Android.bp" 2021-04-30 16:58:56 +00:00
Yuntao Xu
414db426ae Convert IntentPlayground/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186778349
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I92d9b412fb3c0ae85dd1a76497cb6cdb359eaae3
2021-04-29 23:41:40 -07:00
Yuntao Xu
3f434c4083 Convert ShortcutSample/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186778349
Test: compared the results built by Make and Soong
Test: TreeHugger
Change-Id: I8613fbebc139dcf0f398f048e5716f126e987707
2021-04-29 22:47:32 -07:00
Yuntao Xu
10ed0f4b9c Convert MultiDisplay/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I8cbfa4980e3757af5a27a35c255f301b9b5b5be4
2021-04-28 15:51:52 -07:00
Yuntao Xu
8d78ee5666 Convert Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I4b92172ce1370aebd28c11aaeee8c75f5529a570
2021-04-28 14:58:02 -07:00
Ming-Shin Lu
2ccdb18d20 Merge "Remove onToggleSoftInput" into sc-dev 2021-04-27 02:32:35 +00:00
Ming-Shin Lu
9b36e56849 Remove onToggleSoftInput
As CL[1] removed InputMethodService#onToggleSoftInput since framework
side changed internal protocal to simplify the toggle logic without
this method callback.

Also remove ClientCallbackImpl#onToggleSoftInput for
MultiClientInputMethod sample app part to sync this change.

[1]: I390dc029e7bcc30c200926a9bfbbbd0268a1f714

Bug: 182071625
Test: build MultiClientInputMethod
Change-Id: I25568d9d0a963562fdc1d4a021f7016689b9ca54
2021-04-26 15:09:09 +08:00
Bob Badour
4d6df6aead [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/OBJViewer/Android.bp
  samples/HeavyWeight/Android.bp
  samples/MySampleRss/Android.bp
  samples/StartingWindow/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I2ba67154534591f4362b6133b440904ffdfd3bde
2021-04-21 14:43:00 -07:00
Treehugger Robot
3291dd14f1 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: e748063d28 am: 347249060a am: dafb7fc537
Original change: https://android-review.googlesource.com/c/platform/development/+/1682225

Change-Id: I8f5e6007cd6803d4dcbfd498045366761be718a2
2021-04-21 20:01:08 +00:00
Bob Badour
40a7447daa [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/Development/Android.mk
  apps/DumpViewer/app/src/main/Android.mk
  apps/OBJViewer/Android.bp
  samples/ApiDemos/Android.mk
  samples/ApiDemos/tests/Android.mk
  samples/HeavyWeight/Android.bp
  samples/IntentPlayground/Android.mk
  samples/MultiClientInputMethod/Android.mk
  samples/MultiDisplay/Android.mk
  samples/MySampleRss/Android.bp
  samples/RenderScript/HelloCompute/Android.mk
  samples/RenderScript/Levels/Android.mk
  samples/ShortcutDemo/launcher/Android.mk
  samples/ShortcutDemo/publisher/Android.mk
  samples/ShortcutSample/Android.mk
  testrunner/tests/Android_java.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I535f73ffa885f723b9dca745f199ce3a3fd409ea
2021-04-20 14:03:26 -07:00