Commit Graph

3815 Commits

Author SHA1 Message Date
Anton Hansson
29d3b22bf9 Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp am: 538c18b677 am: 310344483f am: f9355bc2cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684826

Change-Id: I78a43228828ae28c503856ce30ecfebee97fb768
2021-08-31 11:26:02 +00:00
Anton Hansson
786bf26e3a 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
(cherry picked from commit cf2f42c36b7997e9ce87682bb3a5511bdb72936f)
2021-08-27 17:41:03 +01:00
Bo Hu
2e9178c68e Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f am: 3c2d039c54 am: 222f23559e am: ac33f427ab
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: Ib87075d9d9f01537abf5b765747462fbf0eaf980
2021-08-26 19:43:49 +00:00
Bo Hu
3c2d039c54 Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: I4d80b2dfb81831ce1176740b2004f3b63d6e5b0a
2021-08-26 18:50:36 +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
Aurimas Liutikas
c82a810842 Add explicit exported tags
Bug: 195988762
Test: make javac-check
Change-Id: Ifd07672da0141c74ad32613a17691c6cd09e54de
Merged-In: Ifd07672da0141c74ad32613a17691c6cd09e54de
(cherry picked from commit 7512a62755)
2021-08-17 12:18:12 -07:00
Aurimas Liutikas
7512a62755 Add explicit exported tags
Bug: 195988762
Test: make javac-check
Change-Id: Ifd07672da0141c74ad32613a17691c6cd09e54de
2021-08-11 21:55:40 +00:00
Yuntao Xu
6158f42467 Merge "Convert Levels/Android.mk to Android.bp" am: ec91659823 am: 7c7034f02a am: cc5ca54b05 am: 6de473cbe7
Original change: https://android-review.googlesource.com/c/platform/development/+/1709407

Change-Id: Ib005479e4d973c46dd261d580e5041f574085607
2021-07-28 19:25:28 +00: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
bed3ca1d79 Merge "Convert HelloCompute/Android.mk to Android.bp" am: 287e52bff6 am: 1185764fe4 am: b8d0a3a9fa am: 41efa982cf
Original change: https://android-review.googlesource.com/c/platform/development/+/1711177

Change-Id: I7be35624009767ffc20808cb64f5c0a6895d5555
2021-07-23 18:54:39 +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
ede9b8a1e5 Merge "Use FixedAspectRatioImageView to demo auto-enter-pip" into sc-dev am: 0e4d25a19e am: c87def1edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15055021

Change-Id: I8892827e3e9566c57edae397a4ce13c4ef408d57
2021-07-15 00:19:46 +00: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
61c260b138 Merge "Convert Android.mk to Android.bp" into sc-dev-plus-aosp am: 7a80636fa6 am: 49fb313b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14637455

Change-Id: I7b34fc06ae4ab62a3f2e2299bb47e407b3013705
2021-06-23 18:49:14 +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
Wilson Wu
16c483359a Merge "Remove sample multi-client IME" 2021-06-16 06:08:56 +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
Wilson Wu
a2c938f437 Remove sample multi-client IME
We have CL[1] to remove the multi-client IME mechanism,
remove the corresponding sample app as well.

[1]: I0bdc8fe3d32ccabc8ea7996fc689543c3f99331a

Bug: 173341412
Test: Build
Change-Id: I355d4309dca1ee712de729921a184f5e40e1730c
2021-05-11 15:57:56 +08: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