Commit Graph

3725 Commits

Author SHA1 Message Date
Anton Hansson
cf4b9a604d Merge "Add sdk extension version info to prop templates" 2021-09-01 09:00:15 +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
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
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
Yuntao Xu
0f12207fa2 Merge "Convert Android.mk to Android.bp" 2021-06-23 21:19:46 +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
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
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
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
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
Pedro Loureiro
2dc09c2150 Add lint baseline to address NewApi errors
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.

Bug: 150847901

Test: m lint-check
Change-Id: I994630133d86cedb7f10eb51282dad0071df0d87
Merged-In: I994630133d86cedb7f10eb51282dad0071df0d87
2021-04-14 10:30:53 +00:00
Bob Badour
f7cf305656 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/BluetoothDebug/Android.bp
  apps/BuildWidget/Android.bp
  apps/CustomLocale/Android.bp
  apps/DevelopmentSettings/Android.bp
  apps/Fallback/Android.bp
  apps/GestureBuilder/Android.bp
  apps/NinePatchLab/Android.bp
  apps/OBJViewer/Android.bp
  apps/PushApiAuthenticator/Android.bp
  apps/PushApiTestAppOne/Android.bp
  apps/PushApiTestAppTwo/Android.bp
  apps/SdkSetup/Android.bp
  apps/SettingInjectorSample/Android.bp
  apps/WidgetPreview/Android.bp
  apps/launchperf/Android.bp
  cmds/monkey/Android.mk
  gsi/gsi_util/Android.bp
  gsi/repack_super_image/Android.bp
  host/windows/Android.bp
  python-packages/Android.bp
  samples/AccelerometerPlay/Android.bp
  samples/AdaptiveIconSample/Android.bp
  samples/AliasActivity/Android.bp
  samples/AndroidBeamDemo/Android.bp
  samples/AppNavigation/Android.bp
  samples/AutofillKeyboard/Android.bp
  samples/BackupRestore/Android.bp
  samples/BasicGLSurfaceView/Android.bp
  samples/BluetoothChat/Android.bp
  samples/BrokenKeyDerivation/Android.bp
  samples/BrokenKeyDerivation/tests/Android.bp
  samples/BusinessCard/Android.bp
  samples/Compass/Android.bp
  samples/ContactManager/Android.bp
  samples/CubeLiveWallpaper/Android.bp
  samples/DataWiper/Android.bp
  samples/DeviceAdminWhitelistedAccount/Android.bp
  samples/FixedGridLayout/Android.bp
  samples/HeavyWeight/Android.bp
  samples/HelloActivity/Android.bp
  samples/HelloActivity/tests/Android.bp
  samples/HelloEffects/Android.bp
  samples/Home/Android.bp
  samples/HoneycombGallery/Android.bp
  samples/InlineFillService/Android.bp
  samples/JetBoy/Android.bp
  samples/LceDemo/Android.bp
  samples/LunarLander/Android.bp
  samples/LunarLander/tests/Android.bp
  samples/MultiResolution/Android.bp
  samples/MultiWindow/Android.bp
  samples/MySampleRss/Android.bp
  samples/NotePad/Android.bp
  samples/Obb/Android.bp
  samples/RSSReader/Android.bp
  samples/ReceiveShareDemo/Android.bp
  samples/SampleSyncAdapter/Android.bp
  samples/SimpleJNI/Android.bp
  samples/SimpleJNI/jni/Android.bp
  samples/SipDemo/Android.bp
  samples/SkeletonApp/Android.bp
  samples/SkeletonApp/tests/Android.bp
  samples/Snake/Android.bp
  samples/Snake/tests/Android.bp
  samples/SoftKeyboard/Android.bp
  samples/SpellChecker/HelloSpellChecker/Android.bp
  samples/SpellChecker/SampleSpellCheckerService/Android.bp
  samples/StackWidget/Android.bp
  samples/ThemedNavBarKeyboard/Android.bp
  samples/ToyVpn/Android.bp
  samples/TtsEngine/Android.bp
  samples/USB/AdbTest/Android.bp
  samples/USB/MissileLauncher/Android.bp
  samples/UiAutomator/Android.mk
  samples/Vault/Android.bp
  samples/Vault/tests/Android.bp
  samples/VoiceRecognitionService/Android.bp
  samples/VoicemailProviderDemo/Android.bp
  samples/WeatherListWidget/Android.bp
  samples/WiFiDirectDemo/Android.bp
  samples/WiFiDirectServiceDiscovery/Android.bp
  samples/Wiktionary/Android.bp
  samples/WiktionarySimple/Android.bp
  samples/XmlAdapters/Android.bp
  samples/apkcachetest/Android.bp
  samples/training/NsdChat/Android.bp
  scripts/Android.bp
  testrunner/Android.mk
  testrunner/tests/Android_native.mk
  tools/apkcheck/Android.bp
  tools/bugreport/Android.bp
  tools/etc1tool/Android.bp
  tools/idegen/Android.bp
  tools/mkstubs/Android.bp
  tools/rmtypedefs/Android.bp
  vndk/Android.bp
  vndk/tools/Android.bp
  vndk/tools/elfcheck/Android.bp
  vndk/tools/header-checker/Android.bp
  vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
  vndk/tools/header-checker/tests/integration/ifunc/Android.bp
  vndk/tools/header-checker/tests/integration/version_script_example/Android.bp
  vndk/tools/image-diff-tool/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-W3C
    legacy_restricted legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
  samples/SearchableDictionary/Android.bp

Added SPDX-license-identifier-Apache-2.0 legacy_unencumbered
to:
  tools/Android.bp

Added SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0
    SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
    SPDX-license-identifier-W3C
to:
  sdk/Android.bp

Added legacy_restricted
to:
  samples/KeyChainDemo/Android.bp
  tools/line_endings/Android.bp
  vndk/tools/definition-tool/datasets/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9847e00fb4278bc083b4debbc751003c995ea45c
2021-02-12 17:13:45 -08:00
Xin Li
e3b57410da Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I37a77cdaf905fe0bf58ad8eebcdff36873aec71a
Change-Id: Idac9218a0e169df9d02d9d8d376a6816315a4b28
2020-08-27 10:16:04 -07:00
Jeff Sharkey
29bc7dcc26 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I56dd8778516103367dc17ae55bdff4457185de46
2020-07-30 20:05:08 -06:00
Linus Tufvesson
084c24eff0 Only show Presentations on suitable displays
Bug: 141745510
Test: Manually verifed, App > Activity > Presentation
Change-Id: I0ca4c18bab97f46971ae3eae29e34e74ed6a5810
2020-07-30 13:52:05 +00:00
Dandan Sun
f4de762f26 Cube 3d live Wallpaper can't be set on android 11
Error log: Didn't find class
"com.example.android.livecubes.cube1.CubeWallpaper1" on path:
DexPathList[[zip file "/system/app/CubeLiveWallpapers/CubeLiveWallpapers.apk

set "installable: true", 3d live wallpaper can be set successfully.

Signed-off-by: Dandan Sun <dandan.sun@nxp.com>
Change-Id: I6388a8083a378bacf2eb8841a22cebf6192170ca
2020-07-17 16:59:02 +08:00
TreeHugger Robot
e7abac1a64 Merge "Post the inline suggestion response handling to next message" into rvc-dev am: b0e8892f5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/11995060

Change-Id: Idd31522c60c15cf3918d57a8c9338ec5f9789c8f
2020-06-26 14:42:11 +00:00
Feng Cao
2b2bc37a66 Post the inline suggestion response handling to next message
* so that it can determine whether to delay the deletion or not
* also fix sample IME to clear suggestions when asked to

Test: manual
Bug: 159479887
Bug: 157515522

Change-Id: I71e6ac9f3593cdfa4e40b7664cbd2eec6343b5af
2020-06-24 20:09:04 -07:00
Svetoslav Ganov
97e4ace420 Merge "Implement chip clipping without reparenting" into rvc-dev am: bbba16a2c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/11961139

Change-Id: I6d036aefeadb4618d2ca43e7a961224c5483be32
2020-06-23 22:55:46 +00:00
Svetoslav Ganov
bbba16a2c9 Merge "Implement chip clipping without reparenting" into rvc-dev 2020-06-23 22:43:14 +00:00
Feng Cao
14ce26727a Optionally schedule a delayed deletion of suggestions in sample keyboard am: 1bbbbac30e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/11921811

Change-Id: I35c90c828259c26fdf449078c5bbbab0ce521f9c
2020-06-23 17:51:36 +00:00
Svet Ganov
e3d07e3b04 Implement chip clipping without reparenting
Reparenting has side effects that require to be compensated
for adding complexity. It turns out there is a simpler way
to do clipping by setting the clip bonds of InlineConteintView.

bug:153825663

Test: manual

Change-Id: Iea09013d24ffc8bb683a24c76be4289833efbb75
2020-06-22 16:57:01 -07:00
Feng Cao
1bbbbac30e Optionally schedule a delayed deletion of suggestions in sample keyboard
Test: manual
Bug: 157515522
Change-Id: Ia5517e8caff538fcc21bf69f15370a3bb2aea5de
2020-06-18 17:08:42 -07:00
Antonio Kantek
aeffc14105 Disabling popped preview key since it is currently broken. am: c448acb573
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/11824890

Change-Id: I1d566b88fe19f570fe52d9d2ea7d6a9d03656e61
2020-06-11 04:33:19 +00:00
Antonio Kantek
c448acb573 Disabling popped preview key since it is currently broken.
Test script:
Step 1: Patch this CL, ag/11800786 and ag/11802630 on rvc-dev repo
Step 2: Build and flash Hawk
Step 3: Build and install a sample multi-client IME
  make -j MultiClientInputMethod
  adb install -r $OUT/system/priv-app/MultiClientInputMethod/MultiClientInputMethod.apk
Step 4: Enable multi-client IME for the side-loaded sample multi-client IME
  adb root
  adb shell setprop persist.debug.multi_client_ime com.example.android.multiclientinputmethod/.MultiClientInputMethod
  adb reboot
Step 5: Open KitchenSync app, select carboard, enter text on Plain Text
tab (sample multi-session keyboard doesn't support numeric keyboard yet)

Bug: 158663354
Test: manual (see test script above)
Change-Id: I11cf467acb1091b1d417e5039519e09fa7be2bf8
2020-06-10 18:49:26 +00:00
Joanne Chung
74a697a777 Follow sample code package-name convention for InlineFillService. am: e48202f01c
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/11716800

Change-Id: I0e402c45559412ff9ea4bbc3a06ae56aa9b50143
2020-06-05 01:16:00 +00:00
Joanne Chung
e48202f01c Follow sample code package-name convention for InlineFillService.
Bug: 155135358
Test: Manual. Install the application and dumpsys to check package
name.

Change-Id: Ifc338e40e6a2d37b775f6a60664231c2ce248eff
2020-06-03 17:34:22 +08:00
Feng Cao
1afa3b7b41 Update the sample IME to solve some flickers am: 0500ea20fa
Original change: undetermined

Change-Id: I53076f69527507c9cf2515a01047a8b9b952c457
2020-06-02 06:27:58 +00:00
Feng Cao
0500ea20fa Update the sample IME to solve some flickers
* This, together with the change on the framework side ag/11685298,
  gets rid of the flicker on the notification pull down/up case, as
  well as switching from username to password.
* The idea is to not clear the suggestions onInputFinish. Instead,
  we schedule a delayed deletion of the suggestions on InputStart,
  which will get canceled if there is new suggestions coming to the
  IME within the timeout. This gets rid of the flicker on the two
  cases mentioned in previous bullet.

Test: manual test
Bug: 157515522

Change-Id: I60d9181de3230d468224e2df08fee59b741d6828
2020-06-01 00:39:45 -07:00
Jimmy Chen
0b3c13c170 Merge "p2p: check device capabilities before launching this app" am: f15d5b7741 am: acd0ad6ab9
Change-Id: Iac6c579cefefdd6b3d2f437a8fb281833ba32874
2020-05-28 02:41:07 +00:00
Feng Cao
4c884825e1 Use updated inline suggestion support lib API am: 3de13dad62
Change-Id: Ia1bff5ea8c73bb2de89544c660050511c39822a8
2020-05-28 01:01:59 +00:00
Feng Cao
3de13dad62 Use updated inline suggestion support lib API
Test: m -j
Test: atest android.autofillservice.cts.inline
Bug: 155172850

Change-Id: Iba6d76c38885498547b0421a0f4df54c7ed41ad3
2020-05-27 10:03:27 -07:00
Jimmy Chen
c2bb1cb556 p2p: check device capabilities before launching this app
Bug: 157446389
Test: launch this app with below condition
      * remove Wi-Fi Direct support, the sample app should be closed, but not crash.
      * wifi is off, the sample app should be closed, but not crash.
      * wifi is on, the sample app could be launced normally.
Change-Id: I056dae7d1ab069ba85612328ea4e1750332c25ff
2020-05-26 18:31:14 +08:00
Feng Cao
163ec3ea06 Update sample IME and autofill provider to use the new support lib APIs am: 0c501136ca
Change-Id: I0c63cb8c944e2b16ace4f648423fe9c7930a9d0a
2020-04-28 21:26:04 +00:00
Feng Cao
0c501136ca Update sample IME and autofill provider to use the new support lib APIs
* refactor the autofill provider code
* keyboard now uses wrap_content when inflating

Test: manual
Bug: 154178486

Change-Id: Ie540178d8f063e3a8e9afb76284b15ab40ada344
2020-04-28 00:04:20 -07:00
TreeHugger Robot
79289b6516 Merge "Fix NPE when run the testing in IntentPlayground" into rvc-dev am: 44b11dd142
Change-Id: I7a63deb14b0e9727e53c5c1a01a20c83a86d26e5
2020-04-24 02:51:27 +00:00
Jeff Chang
6275634b9e Fix NPE when run the testing in IntentPlayground
StartActivity with a null intent lead to the NPE when execute
the Intent testing.

This CL make sure the intent is good before run the testing

Bug: 154568140
Test: Manual to run the intent tesing.
Change-Id: I8d8bc8e1347ae5f095e01f4a718f2ab936574fcc
2020-04-21 10:34:53 +00:00
Orion Hodson
842130c0f0 Merge "Add explicit dependency on jni_headers" am: d7b8f6e0fb am: 34c9491836
Change-Id: I2472aedfdefa230faccf9b53dd8d8eb4f7f3eb54
2020-04-16 10:51:59 +00:00
Orion Hodson
d54dc1d789 Add explicit dependency on jni_headers
Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: m checkbuild
Change-Id: I1801621549689111b058fa611d2d3e2b08ee2a45
Exempt-From-Owner-Approval: build refactoring
2020-04-16 08:25:53 +00:00
Svet Ganov
f34c6275f1 Update the sample keyboard to showcase scroll, clip, toggle
The keyboard now showcases how one can implement a suggestion
strip with some pinned suggestions on the left and the right
of the strip and the strip suggestions are scrollable and well
as clipped to the scroll are's bounds. Also this showcases
how to toggle the layering of the suggestions to temporary
amimate on top of them. Fun, fun fun :)

bug:1234567

Change-Id: I7f2a6ea148de31be7cd0f13f56d72f6e5246a5f8
2020-04-08 03:10:53 +00:00
Adam He
d60f629802 Migrate to new APIs utilizing
android.widget.inline.InlinePreesntationSpecs.

Bug: 151262653
Test: manual verification
Change-Id: Ia03d463d6e7b18c34de95a9cde639bb307c301ef
2020-03-26 15:49:14 -07:00