Commit Graph

1267 Commits

Author SHA1 Message Date
Fan Zhang
fe292515d8 Refactor the layout for MasterSwitch to a 2 target pref
And move the layout to settingslib.

The new TwoTargetPreference is a preference object that has a vertical
divider between main panel and widget (if it exists).

Converted master switch, restricted preference, gear preference to use
the new style

Change-Id: Ia3848cebb06b8edc4e60abf9b0caf13cdb29c22c
Fix: 36511169
Test: make RunSettingsRoboTests
2017-03-22 16:03:40 -07:00
TreeHugger Robot
cb92917e1e Merge "Use fragment context in AppHeaderController" 2017-03-22 20:59:24 +00:00
jackqdyulei
abba040727 Use fragment context in AppHeaderController
The application context doesn't have the correct theme, use
fragment context instead

Fix: 36489386
Fix: 36516826
Test: RunSettingsRoboTests & Screenshot
Change-Id: I8285584220796264d85ea570df5b1df6ebeb275f
2017-03-22 12:42:39 -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
TreeHugger Robot
ceb46ac8e7 Merge "Fix a monkey crash when it dismisses suggestion." 2017-03-22 18:34:56 +00:00
Doris Ling
422fc4a433 Merge "Update preference text for Network & internet screen." 2017-03-22 17:22:27 +00:00
Fan Zhang
8c8c4077fe Fix a monkey crash when it dismisses suggestion.
Change-Id: I300a49ed75381795b6532388f770847ed39a4c8c
Fix: 36509330
Test: make RunSettingsRoboTests
2017-03-22 10:04:39 -07:00
Lei Yu
679ed4c30c Merge "Make percentage add up to dischargeAmount." 2017-03-22 16:49:21 +00:00
Doris Ling
47ec3857a5 Update preference text for Network & internet screen.
- Add footer info to Hotspot & tethering
- Add summary text for Data usage -> Network restrictions
- Update summary for Hotspot & tethering -> Portable Wi-Fi hotspot
- Remove quotes from Wi-Fi summary

Bug: 36296257
Test: make RunSettingsRoboTests

Change-Id: Ibab61b089521a3339e660e9df0db0cd1b316712b
2017-03-21 18:00:59 -07:00
Fan Zhang
3a32ee6132 Move autofill app picker from advanced app to language page
Change-Id: I38979e17e51bda92179ca5b7ba4293677aa18a96
Fix: 36130404
Test: make RunSettingsRoboTests
2017-03-21 17:42:27 -07:00
Fan Zhang
3720e0c4f1 Update system setting page subtext
- Move android version from about phone subtext to system update
- Updates strings for autofill, keyboard & input, factory reset, swipe
  for notification
- Add a new pref category for spell checker and personal dictionary
- Display "None" if any default app is not selected
- Display current keyboard type as language subtext

Bug: 36395109
Test: make RunSettingsRoboTests
Change-Id: Id6ca94ea31e55f1c1ec04e47dcf657a25c35c7fe
2017-03-21 17:40:11 -07:00
TreeHugger Robot
ca3997d27e Merge changes I54360698,Ic8a3db21
* changes:
  Finish removing N/A DO disclosures from search index
  DO Disclosures: Combine personal and work CA cert
2017-03-21 23:04:08 +00:00
TreeHugger Robot
19449197e6 Merge "Delete the estimated time in battery usage graph" 2017-03-21 22:24:56 +00:00
jackqdyulei
da8d9fc3d0 Make percentage add up to dischargeAmount.
Refine it in PowerUsageAdvanced.

Bug: 35960502
Test: RunSettingsRoboTests
Change-Id: I46b06409102334e5e9eed4e540a27315a503f8b0
2017-03-21 15:18:44 -07:00
TreeHugger Robot
f38ad51d4e Merge "Fix some animation janks during code start." 2017-03-21 21:57:02 +00:00
jackqdyulei
3a03b722c6 Delete the estimated time in battery usage graph
Bug: 31012673
Test: RunSettingsRoboTests
Change-Id: Icac85a5fc523b70904e048d17eace30c91fe54ee
2017-03-21 13:39:21 -07:00
Fan Zhang
320d60f0ad Fix some animation janks during code start.
- Create a   summary placeholder for preferences with summary.
- Create a totally empty summary for prefernces without summary.
- For all dynamic prefs that has *no* SummaryLoader, add meta to set
their summary to empty.
- Other dynamic perfs has   as initial summary.

By doing this, all dynamic pref's height is fixed and will not change as
we update summaries, thus eliminating jank during cold start in each
page.

Also removed DashboardAlias for notification preference and default apps as a side fix.

Change-Id: Iec98b7ffef4e920bf573b2244ad04124c1c5d154
Fix: 36414481
Test: make RunSettingsRoboTests
2017-03-21 13:20:18 -07:00
Bartosz Fabianowski
b076e00c5e Finish removing N/A DO disclosures from search index
DO disclosures referring to actions that the admin did not actually
take are hidden in the UI, but still show up in the search index. This
CL switches the remaining PreferenceControllers from setting visibility
to implementing isAvailable() instead.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I54360698f28b549b18cdc230e3b9087cf4e9ff4a
2017-03-21 15:01:02 +01:00
Bartosz Fabianowski
4a19625286 DO Disclosures: Combine personal and work CA cert
It was decided that rather than having two separate items for CA certs
in the personal and work spaces, we should have just one item that
lists the sum of installed certs.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: Ic8a3db214a07992e3970262c2ce91f3df8a87773
2017-03-21 15:00:53 +01:00
Bartosz Fabianowski
e39e8350a1 Finalize strings for enterprise privacy
A few more final string tweaks for the enterprise privacy page.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: Icf91a1188febb303fb1a9e9a5259a06c3b2324da
2017-03-21 11:24:04 +01:00
Winson Chung
5dea0774f6 Merge "Update picture-in-picture settings to match mocks." 2017-03-21 00:28:58 +00:00
TreeHugger Robot
6922f4cd63 Merge "Disable development settings when the switch bar turns off." 2017-03-21 00:16:38 +00:00
Daniel Nishi
af11138589 Merge "Re-add the progress bar for storage preferences." 2017-03-20 22:54:03 +00:00
Fan Zhang
748649b006 Disable development settings when the switch bar turns off.
Change-Id: Icc9953c95ed4d131231bb6ba95d60b43092a3833
Fix: 29274149
Test: make RunSettingsRoboTests
2017-03-20 15:29:59 -07:00
TreeHugger Robot
b70b39c1e3 Merge "Finalize strings for enterprise privacy" 2017-03-20 19:36:44 +00:00
Daniel Nishi
cf0e659a6c Re-add the progress bar for storage preferences.
This re-adds the progress bar and unifies the
StorageItemPreference and its alternate.

Change-Id: Iefc12b4b554306c706c83be232175dd2b84227b7
Fixes: 36223433
Test: Settings robotest
2017-03-20 11:42:46 -07:00
Bartosz Fabianowski
65e18a5778 Finalize strings for enterprise privacy
A few final string tweaks for the enterprise privacy page.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I7957263e768a588188e98f298eaae25ec77abeca
2017-03-20 19:05:08 +01:00
TreeHugger Robot
9812557561 Merge "Start removing N/A DO disclosures from search index" 2017-03-20 18:03:51 +00:00
Christine Franks
b871045074 Merge "Add color temperature preference to Night Display" 2017-03-20 18:03:45 +00:00
Winson Chung
217d0e9d23 Update picture-in-picture settings to match mocks.
- Removing switches in top-level picture-in-picture settings, adding
  details screen for each app which contains the switch and some
  additional information.

Bug: 35957404
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib22df8a52ab857e071ec43dd3e5d1f5282db35cb
2017-03-20 17:19:30 +00:00
Christine Franks
c53ab43d94 Add color temperature preference to Night Display
Bug: 32463283
Test: make RunSettingsRoboTests
Change-Id: Ibf3cf9af05b44a071603d3d7efa6e90ae00c823a
2017-03-20 15:47:41 +00:00
Denis Kuznetsov
9392681afa This CL updates the DO Disclosures page (aka "Enterprise Privacy")
to make items that shows admin granted permissions actionable.
Item click will result in opening the list of apps for a permission.

Test: make RunSettingsRoboTests
Bug: 32692748

Change-Id: I5f2536b116998810857e379f48a26a1c40055590
2017-03-20 15:52:16 +01:00
Bartosz Fabianowski
5dc168af1a Start removing N/A DO disclosures from search index
DO disclosures referring to actions that the admin did not actually
take are hidden in the UI, but still show up in the search index. This
CL takes the following steps toward fixing this:
* Pass the list of PreferenceControllers to the search indexer
* Make the first two PrefrenceControllers set isAvailable() correctly

There are more disclosures to update, but the difficult work is done
as all others will follow the same pattern.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I7d3e248b80abe72b79fce7afa11f28a822de6986
2017-03-20 11:01:51 +01:00
Fan Zhang
11d2d68e23 Move developer options related class to development package
Bug: 34203528
Test: none, purely moving classes around
Change-Id: I3cd1d257f948729fda5c04632e7ce9114c40bd0c
2017-03-17 16:51:21 -07:00
Fan Zhang
2907f86971 Fallback to default wallpaper picker if first choice fails
- Add fallback logic in WallpaperSuggestionActivity
- Move some classes around
- Delete some unused class

Change-Id: Ifc8864428647a94f3ecae50d193c2156b2592ff3
Fix: 36140287
Test: make RunSettingsRoboTests
2017-03-17 16:49:58 -07:00
TreeHugger Robot
c9be7e6ba7 Merge "Remove Index.java from old Search and its dependents" 2017-03-17 23:23:50 +00:00
TreeHugger Robot
edec9f1795 Merge changes from topic 'FrictionIcons'
* changes:
  Revert picker icon sizes to 24dp.
  Comment changes from ag/1991360.
  Clean up wifi_friction icon unused states.
  Fix list item spacing for preferences.
2017-03-17 23:06:10 +00:00
Daniel Nishi
47b07cc9c1 Merge changes from topic 'storage-o-strings'
* changes:
  Use total size and not free in Storage summary.
  Add new strings.
2017-03-17 22:03:48 +00:00
William Luh
f2feb70ba6 Merge "Cache the summary and icons for Security Settings injected tiles." 2017-03-17 22:01:39 +00:00
Matthew Fritze
5c83cfa278 Remove Index.java from old Search and its dependents
Test: make RunSettingsRoboTests
Bug: 35763944, 36192909
Change-Id:  If216e1eeb4c29e7372720c6228fa4e99ea2a9904
2017-03-17 14:26:05 -07:00
TreeHugger Robot
a2475114ac Merge "Remove "remove account" from account sync detail page" 2017-03-17 19:49:10 +00:00
Sundeep Ghuman
4d725a7708 Comment changes from ag/1991360.
Bug: NA
Change-Id: I832f4459e8becdc5862c83c2b2efd5cee0d417c9
Test: NA
2017-03-17 12:44:54 -07:00
Daniel Nishi
d8bcca1852 Merge "Add lifecycle methods for managing the options menu." 2017-03-17 19:41:39 +00:00
William Luh
45f4e1241d Cache the summary and icons for Security Settings injected tiles.
This helps the summary and icons load more smoothly when resuming
from recents.

Bug: 35994047
Test: make RunSettingsRoboTests
Change-Id: I763f7dd19f64007959e1281f0ff04ecd19bbfbfc
2017-03-17 12:09:58 -07:00
Fan Zhang
499c8d54e8 Remove "remove account" from account sync detail page
Change-Id: I40cc9d3d593c31a5e3b02553ac12f77c0825ed51
Fix: 36375879
Test: make RunSettingsRoboTests
2017-03-17 11:02:46 -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
d964467622 Merge "Fix NPE when building suggestion identifier." 2017-03-17 01:47:59 +00:00
TreeHugger Robot
0fea0d33e5 Merge "Add "Use open Wi-Fi automatically" setting." 2017-03-17 01:34:25 +00:00
Fan Zhang
264c0c2bbe Fix NPE when building suggestion identifier.
And refactored the getIdent logic into feature provider.

Change-Id: Id6f66a6942cbaf6d26ae4dca62037a6cf01179a5
Fix: 36314240
Test: make RunSettingsRoboTests
2017-03-16 17:12:22 -07:00
TreeHugger Robot
0fa7262c49 Merge "Listen to mobile data enabled flag change." 2017-03-17 00:09:54 +00:00