Commit Graph

94 Commits

Author SHA1 Message Date
Raff Tsai
02e45574a3 Add SettingsIntelligenceLogwriter
Bug: 124701288
Test: robolectric, manual
Change-Id: Iea446ae600d22ed62c5ee45afd1cd27a89b5de34
2019-03-27 07:14:20 +08:00
Raff Tsai
20308f735d Revert "Import statsdprotolite library to use atoms.proto"
This reverts commit 7ba77ceadf.

Reason for revert: <increase settings apk size>

Change-Id: I39bfebf3f50f997d7b36ed80ac6302a4529a6432
2019-03-21 02:48:18 +00:00
Raff Tsai
7ba77ceadf Import statsdprotolite library to use atoms.proto
Bug: 124701288
Test: rebuild
Change-Id: I38ba80707f8b6cbf7d590d72f4f7fb937dc82a89
2019-03-19 07:19:20 +08:00
Andrii Kulian
ee59c6e596 Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" am: 50a39ba9a9 am: c307426ebe
am: 8ef38e1939

Change-Id: Ibf30daac71377734aa5f141a52ca032e122db05e
2019-03-01 18:27:45 -08:00
Andrii Kulian
50a39ba9a9 Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" 2019-03-02 01:52:04 +00:00
Andrii Kulian
c70f3ebc29 Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
This reverts commit e7fe45f4ca.

Reason for revert: broke git_pi-dev-plus-aosp build

Change-Id: I390b0006bb780ce81520ea851f474e0188f0495e
2019-03-02 01:44:55 +00:00
Takamasa Kuramitsu
747d0e3551 Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am: b67697cf38 am: b496699104
am: 08415faf4a

Change-Id: I8ee4a02c14f7ed4f51658930182b995d342dcc16
2019-03-01 17:14:29 -08:00
Treehugger Robot
b67697cf38 Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" 2019-03-01 21:48:55 +00:00
Takamasa Kuramitsu
e7fe45f4ca Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
This reverts commit 1ea003e834.
Fixes: 116821732

Reason for revert: blocking issue in b/124370422 is resolved

Change-Id: Ie3d5489e5addf12ed7feeada0ceac196eb272f6b
2019-03-01 00:22:38 +00:00
Fan Zhang
ca79899ebf Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 am: 32fbf4740d
am: 798c93aafc

Change-Id: I39c11b23af004e0eb24b3c68eef6373eb70188ec
2019-02-13 10:43:46 -08:00
Fan Zhang
dabfd96c82 Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" 2019-02-13 18:04:09 +00:00
Fan Zhang
1ea003e834 Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit 910457e37a.
Fixes: 124370422


Reason for revert: b/124370422


Error: 

The following topic from AOSP:

https://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)

Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:

FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
2019-02-13 17:59:40 +00:00
Fan Zhang
b485a9195d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d am: dd3e2c4f27
am: 80fd417a58

Change-Id: I7b55262d7e3296a29e7efe4d33a4cab70e000175
2019-02-12 20:12:49 -08:00
Fan Zhang
3905ad125d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" 2019-02-13 00:12:08 +00:00
Anton Hansson
09064cf6d9 Make the Settings permission a required module
This will include the Settings permission file whenever
the Settings app is installed.

Bug: 110072687
Test: make
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
Merged-In: Ia2548355282498bceeffddb564de32a6cb857c66
(cherry picked from commit 16322a0271)
2019-01-14 15:50:28 +00:00
Anton Hansson
9a7786b3e1 Move Settings app to /product
Since this app is frequently customized by OEMs, it doesn't
fit in the mainline /system image right now. Move it to
/product.

Bug: 110072687
Test: make
Change-Id: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
Merged-In: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
(cherry picked from commit f109282c8e)
2019-01-11 16:41:54 +00:00
Arc Wang
8eda83d071 Add more Wi-Fi DPP UI features.
1. Use ConstraintLayout to fix footer buttons at bottom
2. ScrollViews have all other UI components excepts footer buttons
3. Use style/SuwGlifButton for buttons
4. Fix scan fragment crash when rotating screen

Bug: 118794978
Test: manual test
Change-Id: I509b0156c4835c75da75fb7ac4c82f55a0b506a1
2019-01-09 18:25:31 +08:00
Anton Hansson
f109282c8e Move Settings app to /product
Since this app is frequently customized by OEMs, it doesn't
fit in the mainline /system image right now. Move it to
/product.

Bug: 110072687
Test: make
Change-Id: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
2018-12-18 09:51:08 +00:00
Anton Hansson
16322a0271 Make the Settings permission a required module
This will include the Settings permission file whenever
the Settings app is installed.

Bug: 110072687
Test: make
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
2018-12-13 11:01:16 +00:00
Pasty Chang
c1f8600d9f Change to use setupcompat and setupdesign for suw pages
1. remove the dependence of setupwizardlib.
2. add to use setupcompat and setupdesign.
3. modify new footer button in following up cl.

Bug: 120805516
Bug: 120872944
Test: RunSettingsRoboTests
Change-Id: I463dd35b799d4250b2aabce0cb0b8102cf9dd7d6
2018-12-12 03:16:29 +00:00
Cn Chen
f63eee9f0a Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"
This reverts commit 0725bea86e.

Reason for revert: Settings crash
Bug: 120754151
Change-Id: I52f258f7f12d21b8dd16220ba11e50768d0802ee
2018-12-10 07:32:52 +00:00
cnchen
0725bea86e migrate new setupcompat and setupdesign to SetupChooseLockGeneric
Test: cd tests/robotests && mma
Bug: 117080118
Change-Id: I6a29ef5294040d353ee1a0f2bf9ce69de7de9094
2018-12-06 06:19:04 +00:00
Johnson Lu
881ba4e7ee Add QrCamera for QrCode scanner implementation
The QrCode Scanner is for Wifi DPP feature.

Bug: 118797380
Test: RunSettingsRoboTests
Change-Id: I962d069a8c2bce78c00ac8ce9e8ebf176e75873c
2018-11-09 14:38:01 +08:00
Neil Fuller
5331355163 Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24
am: 92982f7167

Change-Id: Iad9b91446823430cb28dd3447819c6b16f7f6b42
2018-10-12 03:42:13 -07:00
Neil Fuller
d0821ca8c7 Remove explicit dependency on bouncycastle
The dependency is unnecessary once bouncycastle
is included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a
2018-10-11 17:02:36 +01:00
Fan Zhang
8985efe3b0 Add contextual card proto libraries.
Test: rebuild
Change-Id: Ifd105a91be4ce3b3ae35766e069d4b4663e54b0f
2018-10-10 10:14:07 -07:00
Raff Tsai
3936e9f3d6 Add SettingsContextualCardProvider
- provide contextual cards for SettingsIntelligence
- add contextualcards libs

Fixes: 116837093
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.homepage.contextualcards"

Change-Id: I873e77fa43e9a8f6056be1f583b1910002efbd2e
2018-10-02 15:04:58 +08:00
Yanjia Li
910457e37a Add LOCAL_RESOURCE_DIR in Settings makefile
Include local Settings resources in build - a result of adding
SettingsLib without defining a LOCAL_RESOURCE_DIR. See comment in:

 frameworks/base/packages/SettingsLib/common.mk

Bug: 116821732
Test: build & manual
Change-Id: I98712af7c568a70ee5c4bcc7bb1c19de4f30ff05
2018-09-28 15:03:37 +00:00
Aurimas Liutikas
03fcde338b Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
2018-08-28 16:35:52 -07:00
Fan Zhang
4329792198 Clean up unused deps
Test: rebuild
Change-Id: I7caa30024046ae832cafef6598ecf74db4aba8bf
2018-07-25 15:25:05 -07:00
Raff Tsai
082f8ee93c Revert "Revert "First commit of dynamic home page feature""
This reverts commit 457f6ef140.

Reason for revert: fix the color check in repohook

Test: make RunSettingsRoboTests

Change-Id: I1b466c412138dfb0f2bffc4270a8932fe3b81c94
2018-07-02 16:02:26 +08:00
Lei Yu
457f6ef140 Revert "First commit of dynamic home page feature"
This reverts commit 3515bc7259.

Reason for revert: CLs in this topic break color check in repohook.

Bug: 110960820
Change-Id: I5934b6baf65515ebbc4e4660ed99747dd581f526
2018-06-29 00:21:14 +00:00
Raff Tsai
3515bc7259 First commit of dynamic home page feature
- Add SettingsHomepageActivity
- Add feature flag
- Use com.google.android.material_material library

Change-Id: I325be249f739d3b03dc2f0d722319f5771e2313b
2018-06-28 11:46:37 +08:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Jason Monk
8a485f0ada Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08
am: 8e51db884e

Change-Id: I790d275e30bccd446a00615149a90440d172e163
2018-04-04 16:45:09 -07:00
Jason Monk
20210122bd Updates to match prebuilts drop
Test: build
Bug: 77482321
Change-Id: I65a2cffb0a921ef6acb58ff500a7da8a8f870e76
2018-04-04 16:08:17 -04:00
Tony Mantler
0fcd6cbaa8 Autogenerate SearchIndexableResources subclass
Bug: 77148954
Test: RunSettingsLibRoboTests RunSettingsRoboTests RunSettingsGoogleRoboTests RunArcSettingsRoboTests
Change-Id: I842c42c55014c3310070ef22bd4f0d9a70dfd804
2018-04-03 10:26:55 -07:00
Søren Gjesse
d9ce79763a Enable R8 for settings
Keep constructor which is only used directly from test.

Update Proguard configuration to include information on checked
exceptions for Mockity to mock thorwn exception.

Bug: 74756073
Test: atest
com.android.settings.deviceinfo.storage.StorageAsyncLoaderTest#testRemovedPackageDoesNotCrash
Utf8ByteLengthFilterTest
Change-Id: Iae87e6647b28ee69d38bd8891df46239779c459c
2018-03-22 21:05:11 +01:00
Søren Gjesse
6f21dfa213 Revert "Revert "Disable R8 for Settings""
This reverts commit f38d78bf09.

Reason for revert: Enabling R8 again after https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/3769994 lands.

Exempt-From-Owner-Approval: ccross@ made the requested change
Change-Id: I81dcb8c23974d3f3a8c11c39140d17266b4ae18a
2018-03-22 09:27:57 +00:00
Doris Ling
f38d78bf09 Revert "Disable R8 for Settings"
This reverts commit f416cf775e.

Revert reason: this change is breaking Settings app presubmit test

Bug: 74834445
Change-Id: Ibfc1b8003ccb4044ded2a8d5661fb45bf3d090f5
2018-03-19 21:44:49 +00:00
Søren Gjesse
f416cf775e Disable R8 for Settings
This failure seems related to R8:

https://sponge.corp.google.com/target?show=FAILED&sortBy=STATUS&id=4f1b303e-ef57-4dc6-9ebb-95ca5cda398e&target=com.android.settings.tests.unit:

java.lang.InstantiationError: com.android.settings.bluetooth.Utf8ByteLengthFilter
at com.android.settings.bluetooth.Utf8ByteLengthFilterTest.testFilter(Utf8ByteLengthFilterTest.java:34)
at java.lang.reflect.Method.invoke(Native Method)
at junit.framework.TestCase.runTest(TestCase.java:168)
at junit.framework.TestCase.runBare(TestCase.java:134)
at junit.framework.TestResult$1.protect(TestResult.java:115)
at android.support.test.internal.runner.junit3.AndroidTestResult.runProtected(AndroidTestResult.java:73)
at junit.framework.TestResult.run(TestResult.java:118)
at android.support.test.internal.runner.junit3.AndroidTestResult.run(AndroidTestResult.java:51)
at junit.framework.TestCase.run(TestCase.java:124)
at android.support.test.internal.runner.junit3.NonLeakyTestSuite$NonLeakyTest.run(NonLeakyTestSuite.java:62)
at android.support.test.internal.runner.junit3.AndroidTestSuite$2.run(AndroidTestSuite.java:101)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:458)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641)
at java.lang.Thread.run(Thread.java:764)

Bug: 74756073
Test: Run Settings tests, and the failure above is gone.
Change-Id: I6071ae59f51ab5d56243774855ecc845267e7103
2018-03-14 19:47:58 +01:00
jackqdyulei
3ee28c810d Add auto restriction for excessive background
If it is excessive bg anomaly and auto restriction is on, then
restrict the anomaly in receiver and store it in database.

Also in this cl we move the anomaly logic to a JobService, so all
works are done in a background thread and won't interfere the main
thread.

Bug: 72385333
Test: RunSettingsRoboTests &&
Will add auto restriction test once robo framework is updated(b/73172999)
Change-Id: Id0ec5fb449ce26bf19a292bcbe63838d621cfd8e
2018-02-23 10:11:34 -08:00
hansson
a42bfa83df Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible." am: f5b75dd74d am: aa0812f42b
am: 685b923a1b

Change-Id: I39a6aad6f8bf21741de4feb838694ab43dc5d074
2018-02-23 07:35:31 +00:00
Anton Hansson
861554a2d9 packages/apps/Settings: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: Ic906adbd670c4dbfe2cdf0b71cdbeaf9ac08a27e
2018-02-22 16:12:29 +00:00
Aurimas Liutikas
0fbf8d8cf1 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: If03b73bc972e4404779394e025679024b8e5d05b
2018-01-26 22:52:58 +00:00
Matthew Fritze
b277557991 Depend settings on slices in the support library
Test: make
Bug: 67996923
Change-Id: Ifcb544424df27f3faa8872e6266de286cc706d59
2017-12-06 08:19:07 -08:00
Colin Cross
00c0d436f4 Merge "Remove unnecessary core-oj library"
am: a37bf5616a

Change-Id: I9a2fa6cb15e5a908f37f6a85967f93419f5e22db
2017-09-26 01:18:50 +00:00
Colin Cross
6be287a209 Remove unnecessary core-oj library
core-oj is part of the default java libraries and should not be
explicitly included by a package.

Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
2017-09-23 22:09:31 -07:00
Andrew Sapperstein
a0e816d9d3 Revert "Initial search bar implementation."
This reverts commit 14934599dd.

Bug: 37477506
Change-Id: I510b9a71dd3f19a3d2194da1f4d8f8060d0a4935
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-06-06 17:30:17 +00:00
Andrew Sapperstein
048f6fb8b3 Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-05-31 15:24:25 -07:00