Commit Graph

70 Commits

Author SHA1 Message Date
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
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
Andrew Sapperstein
14934599dd 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

Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug: 37477506
Test: make RunSettingsRoboTests
2017-05-31 14:03:26 -07:00
Maurice Lam
62478b9e3e Depend on gingerbread variant of SuwLib
Test: Existing tests pass
Bug: 33094508
Change-Id: I489bbdba2cd0cf79f610c6827ee2af8e5c53a566
2016-12-16 14:11:02 -08:00
Adam Lesinski
701af87a68 Build with AAPT2
Change-Id: Ib0b4a597efae178785c308451b882196c2fb807a
2016-08-17 10:19:00 -07:00
Andrew Sapperstein
867bb9c07a Create feature factory interface & initial impl.
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.

Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.

BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
2016-04-13 13:02:38 -07:00
Fan Zhang
4bffbdb928 Revert "Add suggestion carousel view and dependencies to settings"
This reverts commit 0050ac0bb7.

Change-Id: Ic61137bae0fa1a6de5ba4970e8a3a3b4fe0469a3
2016-04-11 09:56:46 -07:00
Rachel Zhang
12b2261033 Merge "Add suggestion carousel view and dependencies to settings" 2016-04-01 17:35:47 +00:00
Rachel Zhang
0050ac0bb7 Add suggestion carousel view and dependencies to settings
Bug: 27752219
Change-Id: Idc14227990c902c04de5bfb6649efb6da64c9168
2016-03-31 14:12:26 -07:00
Ying Wang
686adfc32f Remove obsolete LOCAL_DX_FLAGS
Bug: 27400061
Change-Id: Ia65d8ebdbb96d34fe12badc0015716d5d9fde0ca
2016-03-31 11:16:55 -07:00
Maurice Lam
3806f977e6 Revert "Revert "Use SetupWizardPreferenceLayout""
This reverts commit 73512ee684.

With ag/866290, this change can be applied again.

Bug: 27152471
Change-Id: I0fd78218b989e99873765f7678f0113fb2c08f16
2016-02-16 17:22:08 -08:00
Udam Saini
73512ee684 Revert "Use SetupWizardPreferenceLayout"
This reverts commit a95e7c3c09.
This causes a bug where you cannot access fingerprint from settings.

bug:27152471
Change-Id: I4f3078a81b66d44bb6f29ed3afc501e0b56a369e
2016-02-11 23:17:48 +00:00
Maurice Lam
a95e7c3c09 Use SetupWizardPreferenceLayout
Update SetupChooseLockGeneric to use SetupWizardPreferenceLayout,
which is a layout designed to be used with Preference v14.

Change-Id: I31f372b5f70382a9f6502c790cb8981277a8d5e1
2016-02-11 00:25:07 +00:00
Jorim Jaggi
75b22c67fc Enable multi-dex for incremental settings builds
Change-Id: I265eb5ff508206bd5b4205db612c3519bb9a5ed8
2016-01-29 15:15:18 -08:00
Kenny Root
9ceeeb6c02 resolve merge conflicts of bdc6074276 to master.
Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359
2016-01-21 19:30:35 -08:00
Kenny Root
1b291c13f4 Stop using AlgNameMapper
AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.

Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
2016-01-20 15:50:57 -08:00
Jason Monk
39b467482d Depend on support lib preferences
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-10-13 10:12:20 -04:00
Maurice Lam
820ee63716 [Settings] Remove dependency from SUW nav bar
Remove setup wizard navigation bar as one of setting's dependencies,
since all the users are using setup wizard library, which includes
the navigation bar as one of its components.

Change-Id: I4ce2b8639155b813a782115725c88d5b1c5c8bfc
2015-09-28 14:57:20 -07:00
Jorim Jaggi
11eae0450b Allow incremental builds for settings.
Change-Id: Iec6788d42c63020b7facfdfc45e1add244bb9523
(cherry picked from commit c9f73801df)
2015-04-27 21:16:03 +00:00
Jorim Jaggi
c9f73801df Allow incremental builds for settings.
Change-Id: Iec6788d42c63020b7facfdfc45e1add244bb9523
2015-04-24 14:35:02 -07:00
Jeff Sharkey
94635995e4 Checkpoint of new storage wizards.
Use frameworks/opt/setupwizard/library/ for consistent behavior and
styling on phones and tablets.  Implement every step of wizard flow
and connect them together, even though some steps are currently
non-functional.  All strings to match UX spec, with some adjustment.

Wizards inherit from helper base class.

New interstitials before unmounting or formatting private storage
to confirm user knows consequences.

Bug: 19993667
Change-Id: I2c774e1718d513805ee8aecfc96d066d4730450c
2015-04-13 21:45:39 -07:00
Jason Monk
f15248bdb5 Make Settings include new SettingsLib
Bug: 19180466
Change-Id: I1ab5f2ac2d5faa5640ebe6e08ba8071a02ac8308
2015-02-04 15:35:05 +00:00
Pavel Zhamaitsiak
cb267a6f8c Add button in "hidden" settings to flip "VoLTE Provisioned" flag
VoLTE Provisioned flag can be lost when new device image is flashed. Currently
there is no way to trigger Verizon provisioning update from device. This patch
adds button in hidden settings which allow to manually change value of the
flag.

Bug: 19038362
Change-Id: I23f13004dbcf9eaf711c66261696772b1d7bfd6e
2015-01-22 02:57:37 +00:00
Elliott Hughes
c550f0bff4 Settings psuedolocalization fixes.
We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.

Also remove some dead code now zz_ZY and zz_ZZ are gone.

Bug: 17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
2014-08-22 12:24:00 -07:00
Maurice Lam
6776c67ac1 [WifiSetup] Use setup navigation bar
Use the setup navigation bar in wifi setup activity.

1. Include frameworks/opt/setupwizard/navigationbar/common.mk in the
make file.
2. Make WifiSetupActivity implement NavigationBarListener
3. Added the fragment in setup_preference.xml, wrapping the whole
screen in a LinearLayout
4. Moved skip and next screen logic to WifiSetupActivity, refactored
the skip dialogs into a fragment

Change-Id: Ia973c0a61faa3ead201bd10d5aa8de4bc6e091c1
2014-06-16 17:19:14 -07:00
Amith Yamasani
0dd03ebe0f Don't build tests by default
Change-Id: I30de838657199b853948b6ba77bc9e5da28cc4f7
2014-05-20 17:37:44 -07:00