Commit Graph

527 Commits

Author SHA1 Message Date
Daniel Nishi
32f95292bf Merge "Don't crash on opening ejecting USB." into oc-dev 2017-04-25 22:30:14 +00:00
Daniel Nishi
63a11c56de Always use GB as the unit in Storage Settings.
Bug: 36901322
Test: Settings unit tests

Change-Id: I08c711db6a271522942a01d1adf3e8e5223010f7
2017-04-25 15:23:49 -07:00
Sundeep Ghuman
87bf49a436 Force update APs when enabling wifi in WifiSettings.
This reverts commit b2bdc8f17b
and fixes a broken Espresso test case.

Reason for revert: Rolling forward after fix in ag/2133493, to fix b/37324736

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

Change-Id: I9cdf8cb1043af5d527eccbd9cc56d3b02419d7ac
2017-04-25 15:12:00 -07:00
Daniel Nishi
4a150e75fd Merge "Gracefully handle null volumes after forgetting." into oc-dev am: d6d6185167
am: 8f68658aef

Change-Id: I1033e51c837c9ed51e424435e8b49cac7eca51dc
2017-04-20 18:54:28 +00:00
Daniel Nishi
d6d6185167 Merge "Gracefully handle null volumes after forgetting." into oc-dev 2017-04-20 17:05:29 +00:00
Fan Zhang
8adcd2f441 Merge "Add test to verify regulatory info launches properly" into oc-dev am: 4766183336
am: 2bb10c9e57

Change-Id: I9d58c7ee1154c640e570627477e97ffaeb68777f
2017-04-19 01:54:40 +00:00
Daniel Nishi
6b37d6341f Gracefully handle null volumes after forgetting.
If a user tells a device to forget a storage volume and then
goes back to the PrivateVolumeForget activity from their Recents, it
attempts to re-initialize itself with a volume that it forgot.

And this makes Settings crash.

By gracefully killing the activity when we try to open
PrivateVolumeForget for a forgotten volume, we avoid this crash.

Change-Id: Ib4e881c10f0c872ce6b268b16a573960230ef99b
Fixes: 34856304
Test: Settings unit test
2017-04-18 14:59:20 -07:00
Fan Zhang
06ee0e932f Add test to verify regulatory info launches properly
Test: runtest --path tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
Change-Id: I531a05bde858790819ac11c8ffcea2f6d1942ec2
Fix: 34370866
2017-04-18 12:53:24 -07:00
Daniel Nishi
edafa44c7e Don't crash on opening ejecting USB.
This crash occurs because, even if you finish an Activity during
onCreate, the other lifecycle methods occur. In this case,
onActivityCreated assumes that onCreate ran properly.

By exiting early from onActivityCreated, we can ensure the activity
is finished properly.

Change-Id: Ia354341bf82d295c7dd042668fb11d588ddfebc0
Fixes: 37334861
Test: Instrumentation test
2017-04-18 12:19:36 -07:00
Jeff Sharkey
5d9ccedc59 Merge "Follow storage API polishing." into oc-dev am: e398a84199
am: 4ecbc32b48

Change-Id: Ie47474e46fa6ebfffdddad04ab8c99b332c4f8cc
2017-04-17 23:58:17 +00:00
Fan Zhang
b0c2ca7c07 Merge "Use standard preference layout for wallpaper picker" into oc-dev am: 8e1d588cdf
am: d96ce57713

Change-Id: I50bb90a53c74960465c73aafc8ae5ee0e8021b50
2017-04-17 22:33:08 +00:00
Christine Franks
8e1202b54e Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev am: c2d56691fe
am: f0320dd7aa

Change-Id: I7f4624486a8299c7e36b3eb97167795a2f5da380
2017-04-17 22:32:01 +00:00
Jeff Sharkey
e398a84199 Merge "Follow storage API polishing." into oc-dev 2017-04-17 22:26:44 +00:00
TreeHugger Robot
8e1d588cdf Merge "Use standard preference layout for wallpaper picker" into oc-dev 2017-04-17 21:10:31 +00:00
Jeff Sharkey
b80f1ddaf0 Follow storage API polishing.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37325923, 35812899, 35806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d
2017-04-17 14:29:15 -06:00
Fan Zhang
1a4fea2b72 Use standard preference layout for wallpaper picker
Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix: 37351626
Test: visual
2017-04-17 12:23:52 -07:00
Christine Franks
c2d56691fe Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev 2017-04-17 18:30:27 +00:00
Christine Franks
66d59f8d38 Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS
Bug: 35356645
Test: Verify for both config_nightDisplayAvailable true and false,
adb shell am instrument -e class
com.android.settings.display.NightDisplayTest -w
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7de3eddf62428d75bef621d3387fa33a76205fe7
2017-04-17 09:47:26 -07:00
Daniel Nishi
95261b9239 Fix storage settings crash.
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.

Change-Id: I1b96b0697f4041be356260d6c675593affc1cb69
Merged-In: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes: 36793223
Fixes: 36793372
Test: Settings unit test
2017-04-13 13:21:26 -07:00
Daniel Nishi
89bec9c941 Fix storage settings crash.
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.

Change-Id: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes: 36793223
Fixes: 36793372
Test: Settings unit test
2017-04-10 16:06:16 -07:00
Daniel Nishi
f588f7678d Add a movies & tv apps category to storage settings.
Change-Id: I055e93d2a151195b90a5fd64f4fddebbbcffef59
Merged-In: Idfabe83739272b19cbef4b13a82339170f8f97b3
Fixes: 36223441
Test: Settings Robotest
2017-04-06 13:36:12 -07:00
TreeHugger Robot
ab13d8990f Merge "Change test type from InstrumentationTest to AndroidJUnitTest" 2017-04-01 04:49:19 +00:00
Daniel Nishi
c2157ab443 Add a movies & tv apps category to storage settings.
Change-Id: Idfabe83739272b19cbef4b13a82339170f8f97b3
Fixes: 36223441
Test: Settings Robotest
2017-03-28 17:18:15 -07:00
Dan Shi
0322efaac4 Change test type from InstrumentationTest to AndroidJUnitTest
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: Ib403ce00ed33de3a39534f84da2a679f244e7a1c
2017-03-22 23:33:31 -07:00
Dan Shi
41d96207e8 Add test config to SettingsUnitTests
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: Ie9fdc4717a71cb0f472b004b704acf3c4f770267
2017-03-22 12:07:08 -07:00
Paul Duffin
6b58b5c9f7 Remove ambiguous wildcard import of org.mockito.Matchers.*
The recent upgrade to Mockito 2.7.13 has caused some problems
for grok (and new javac toolchain). The changed files used
wildcard imports to import the same methods from both Matchers
and Mockito.

This was not a problem previously because in the previous
version of Mockito the Mockito class extended the Matchers class
and so even though two methods with the same name were imported
they were not treated as a conflict because they were treated as
being the same method. In 2.7.13 the Mockito class no longer
extends the Matchers class instead they both extend the
ArgumentMatchers class and so for some reason javac no longer
treats them as the same method.

This was not detected by presubmit builds because jack is
still treating the methods as being the same.

Bug: 32912773
Test: m -j32 ANDROID_FORCE_JACK_ENABLED=disabled FrameworksWifiTests
Change-Id: I8c2b1dd39d2d653fe0fba19ed6421b7de25bb82f
2017-03-17 13:10:03 +00:00
TreeHugger Robot
7c22d1f181 Merge "packages/apps/Settings: Add APCT tests to the device-tests suite." 2017-03-16 18:06:24 +00:00
Simran Basi
1897993edb packages/apps/Settings: Add APCT tests to the device-tests suite.
This CL adds the APCT tests within this project to
a similar suite as CTS known as device-tests.

The current method of running APCT tests in the infrastructure
is unaffected.

Bug: 35882476
Test: `make dist device-tests -j` and local builds of
      continuous_instrumentation_tests & continuous_native_tests

Change-Id: Ie1b2c6aefbe1497a2e90077a3ed8ab75721dc87b
2017-03-15 15:12:51 -07:00
Daniel Nishi
02b269be4b Merge "Category breakdown size should match total size." 2017-03-15 20:30:10 +00:00
Daniel Nishi
fd82752694 Count legacy games as games in Storage view.
The old Games flag was being ignored for categorization.
This caused the very few games which used the flag to be
miscategorized as "Other apps."

Change-Id: Ib8650d1c43579bc1698576c09c884e5a7bc4626d
Fixes: 36109122
Test: Settings robotest
2017-03-13 13:20:30 -07:00
Daniel Nishi
325d38043f Category breakdown size should match total size.
The system apps' base size was not being properly attributed
to the system. This was causing the storage to go totally
unattributed (and causing roughly a 1GB gap in sizes.) On my
test device, the sizes now sum properly.

Change-Id: Ibc13015e40f854090a7a3ec09eef4c5c52918e0f
Fixes: 35144717
Test: Settings robo
2017-03-10 15:15:42 -08:00
Paul Duffin
c1542f1fd4 Refactor code incompatible with Mockito 2.7.13
Bug: 32912773
Test: make checkbuild
Change-Id: Idcd89438aa05ed2d010934cc6613763d4cfb9885
2017-03-10 14:59:09 +00:00
Jason Monk
2859b9a302 Update theme setting to not require reboot
Add calls into the OverlayManagerService to update the overlays
directly and remove reboot dialog.

Test: make RunSettingsRobotTests
Change-Id: I92841e643eab70b4b194f60cce95ce3cedb75972
Fixes: 34701451
2017-03-08 20:20:16 -05:00
Daniel Nishi
73a1c2afb3 Use the new package stats query.
This allows us to remove the logic w.r.t. uid merging.

Bug: 35754646
Test: StorageAsyncLoaderTest
Change-Id: I93aff1d55e0e761269c135f0e821ed2067eeda06
2017-02-28 13:30:13 -08:00
Chris Tate
eb32ad8779 Merge "Send the tethering entitlement broadcast to manifest receivers" 2017-02-23 00:50:08 +00:00
Christopher Tate
9ea3dcb994 Send the tethering entitlement broadcast to manifest receivers
Bug 35661943
Test: manual

Change-Id: I8bf9fcd7634c15b2380e83274db18eb29f993686
2017-02-22 14:09:47 -08:00
Anton Philippov
b7948cedc2 Remove intent-filter from PrivacySettingsActivity
BackupSettingsActivity should be the only activity listenting to the
BACKUP_AND_RESET_SETTINGS intent. It then decides which acitivity to
launch.

Bug: 35237721
Test: make SettingsUnitTests
Change-Id: I2021ec57e08c305771dd040c52725065597fd042
2017-02-22 00:25:56 +00:00
Daniel Nishi
422e7c354d Update the loading of info for the secondary users.
Bug: 34715777, 34225103
Test: Settings Robotest
Change-Id: I32bb15ad8bc866c1fd41728e56faa8b09ae11eb6
2017-02-21 12:08:28 -08:00
Daniel Nishi
7cec1bc53c Use the "fast track" storage calculation for all categories.
Bug: 34204877
Test: Settings Robo
Change-Id: I4a3e26e6e96e9b697c1019160c053b079076d3a2
2017-02-02 13:02:32 -08:00
Daniel Nishi
0905600b7a Use the fast track calculation for apps.
This replaces the calculation of the apps category
and add in a calculation for the games category using
the faster GID calculation. This should result in app
sizes loading roughly 10 times after.

Bug: 34204877
Test: Settings unit & robo tests
Change-Id: I78044a8d50f695f8c0a7e04183030232a9719260
2017-02-01 14:02:03 -08:00
Jason Monk
6324cffc7e Move theme setting out of tuner to display
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/display/
Fixes: 34682466

Change-Id: Ifc21e390bf8441308871d487bd60d59826603ec2
2017-01-25 10:34:29 -05:00
TreeHugger Robot
5228059c50 Merge "Add example of google truth in a non robolectric test" 2017-01-19 23:15:49 +00:00
Matthew Fritze
1212b0ea3f Add example of google truth in a non robolectric test
Change-Id: I6549ae01b31df39462d252e767fc3255b05813fe
Fixes: 34277648
Test: make SettingsUnitTests, make RunSettingsRoboTests
2017-01-19 11:21:20 -08:00
Paul Duffin
8cedf7e8e8 Merge "Prepare for removal of legacy-test from default targets" 2017-01-19 11:56:38 +00:00
Paul Duffin
1250371b6b 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: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9
2017-01-18 16:39:34 +00:00
Maurice Lam
92d3c1e653 [Fingerprint] Don't show warning dialog if screen lock is set up
If the keyguard is already secure (i.e. if the backup screen lock is
already set up), do not show the skip dialog which warns user about
the danger of not having a screen lock.

Bug: 34129157
Test: adb shell am instrument -w com.android.settings.tests.unit
Change-Id: I6f777631487de89ab25a08ea017dd6194dde464d
2017-01-12 14:39:29 -08:00
Fan Zhang
9ec4536d8a Show setting tiles for secondary users
Change-Id: I912b3324753731a6633cf6fabfc26ae2e61963a0
Fix: 34176802
Test: runtest --path tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
2017-01-10 13:13:04 -08:00
Fan Zhang
408c6a3e87 Set parent activity for search.
This enables the nav up button from actionbar.

Fix: 34176247
Test:  runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SearchActivityTest.java

Change-Id: I28ef9f1270f5a178346ff9bd9148f7f2035858b2
2017-01-09 16:39:25 -08:00
TreeHugger Robot
a8dee23ee5 Merge "Hide next button when max fingerprints enrolled" 2016-12-15 22:57:27 +00:00
Matthew Fritze
172eac4c51 Test the Columns in the SearchIndexablesContract
The test is going into settings because of the lack testing
support in framework/base for this kind of change, and
because Settings search depends on this change.

Test: make RunSettingsUnitTests
Bug: 33390556
Change-Id: I8a87d4228a37fca475791409b89c7d135c29004a
2016-12-07 09:45:51 -08:00