Commit Graph

21 Commits

Author SHA1 Message Date
Colin Cross
ab91ccae91 Merge "Fix ManifestMerger issues" am: 684b5f038b am: c5e5b64b04
am: 6c40e4745d

Change-Id: Ide97a39158b8ec9310ded188fa9f75c6795fc2b5
2018-06-15 22:56:59 -07:00
Colin Cross
c5e5b64b04 Merge "Fix ManifestMerger issues"
am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
2018-06-15 16:59:21 -07:00
Colin Cross
6719222fb7 Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in SettingsLib so that the build system
doesn't raise the minSdkVersion value specified in the manifest,
which causes ManifestMerger to error when trying to merge it into
a package that specifies a lower minSdkVersion.

Bug: 78447299
Test: m java
Change-Id: Ie2c2458647cd6495418999b35894dc92343992cc
2018-06-14 15:25:20 -07:00
Alan Viverette
2789e544f1 Migrate to AAPT2
Bug: 73128633
Test: make checkbuild
Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
Merged-In: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
(cherry picked from commit e3264ba6cf)
2018-05-03 16:38:17 -07:00
Aurimas Liutikas
fd52c1433c Migrated SystemUI & SettingsLib to androidx
Test: make SystemUI SettingsLib
Bug:76692459
Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95
2018-04-20 12:48:23 -07:00
Alan Viverette
e3264ba6cf Migrate to AAPT2
Bug: 73128633
Test: make checkbuild
Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
2018-03-29 10:29:05 -04:00
Alan Viverette
c6b34c6aed DO NOT MERGE Clean up SettingsLib dependencies
v14-preferences is an empty lib and libraries cannot directly
reference other libraries' R classes due to a bug in Make builds

Bug: 73250914
Bug: 74248169
Test: make && make checkbuild
Change-Id: Id156b2a2140cabc98b58b5312ea28da42f4ca63b
2018-03-24 00:27:39 +00:00
Aurimas Liutikas
a43e216e3e Use the correct prebuilts for lifecycles.
This change should have no effect on the app. It is simply unifying some of the prebuilts.

Bug: 72566647
Change-Id: Ic748f8f425e8c8e44bacf62ea61b9af307774911
2018-01-26 23:20:09 +00:00
Paul Duffin
4ae4005bde Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19 am: 6ff2ad3044
am: 1c091ba045

Change-Id: I1a6d1130de87ef0a69727a7c7a7950704df47c04
2017-12-12 13:32:38 +00:00
Paul Duffin
cc491f3330 Remove LOCAL_STATIC_SHARED_LIBRARY usage
That property is not used during the build so its usage can be safely
removed because it has no effect.

Bug: 30188076
Test: make checkbuild
Change-Id: Ie337426733c26ec12b344b8f4b7467aa7f9f63f3
2017-12-11 20:19:56 +00:00
Tony Mantler
2407eb7352 Make sure Lifecycle proguard rules are used
At least when aapt2 is enabled. Other projects will have to include
them manually.

Test: Tap build number, ensure toasts appear
Bug: 69350851
Bug: 69257739
Change-Id: I7967ecb1e38a89829e9d008ea09c56b7fb725230
2017-11-29 15:00:55 -08:00
Aurimas Liutikas
ac44e410b6 Merge "Fix import of android-support-annotations" 2017-11-15 00:23:39 +00:00
Aurimas Liutikas
12a37963ac Fix import of android-support-annotations
Bug: 69161825
Change-Id: I647516330d9990869f78084e2d393742000e836b
2017-11-14 11:28:21 -08:00
Tony Mantler
ece840b115 Convert SettingsLib Lifecycle to Flatfoot
Bug: 69257739
Test: m -j RunSettingsLibRoboTests
Change-Id: Iaf14f6f26689a54248bd27cffce0423e857181b9
2017-11-14 10:20:24 -08:00
Sundeep Ghuman
32952e0436 Create Espresso test for WifiSettings.
This method was being stripped by proguard and hence the tests could not
run.

Bug: b/36403696
Test:  runtest --path
packages/apps/Settings/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I30b26e960a876c0c024154bee809c0ab6e988e39
2017-03-31 13:03:33 -07:00
Paul Duffin
1d0244a846 Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: If507b641624a2933e722f61e815890fcdf442265
2017-01-20 09:00:33 +00:00
Sudheer Shanka
dca26812d1 SettingsLib: Update Android.mk to include test package makefile.
Change-Id: I9d6574ef059872e449abfe47f16f80143bb86aec
Fixes: 31327402
Test: verified that test appears after running 'make continuous_instrumentation_tests dist'
2016-09-07 18:35:02 -07:00
Adam Lesinski
5ff3ad6312 SettingsLib: Build with AAPT2
Bug:22775504
Change-Id: I2e5015235384d124418d32186daa190f38e1c5b3
2016-04-14 14:45:21 -07:00
Sudheer Shanka
7ff866d286 Move restricted padlock support to SettingsLib
Change-Id: Ib0b1c58d1f45e017b6b17ce0a55ca839b900cba4
2016-01-12 18:14:24 +00:00
Jason Monk
744b63632a First pass at drawer support for SettingsLib
Change-Id: I9669bd511dd3c4b7f59b8600a5af65d9837af015
2015-11-04 15:02:55 -05:00
Jason Monk
2ba4ce6a06 Create SettingsLib
This will hold common code that SystemUI and Settings (and others)
will share.

Bug: 19180466
Change-Id: I6614b31d6c3b0a2d426a2aa8ce66725245339d22
2015-02-02 11:33:17 -05:00