Commit Graph

137 Commits

Author SHA1 Message Date
Yoshinori Hirano
53cfd11793 Display network name in status bar
When config_showOperatorNameInStatusBar is true, "Network name" setting
is displayed in Settings app (Settings > Display).
The user can turn on/off the feature to display the network name in the
status bar from Settings app.

Fixes: 67620513
Test: manual - go to Settings > Display and turn on/off Network name.

Change-Id: I43f1d9cbea363527250639ce6146f1c5c6c8a482
2017-10-31 09:08:06 -07:00
TreeHugger Robot
11151f5052 Merge "Eliminate duplicate keys in pref xmls." 2017-10-28 19:39:28 +00:00
Fan Zhang
57ef92a810 Eliminate duplicate keys in pref xmls.
- Remove additional_system_update pref device_info page, we don't need
  it.
- Update keys in xml and Preference controller, and search index
  provider.
- Clean up in ScreenZoomPreference, it's anti-pattern to set fragment in
  constructor.
- Whitelist 2 that are super hard to remove.

Change-Id: Ibab6e2cb074513042a2ae007d9085aa64046eec8
Fixes: 67852637
Test: uniquePreferenceTest
2017-10-28 11:06:37 -07:00
Doris Ling
8b14a1a7a6 Change to use the expand button in support lib.
- functionality for hiding portions of the preferences in the preference
screen is added to the support lib. So, changing the settings
implementation to use the feature from the support lib instead.
- remove ProgressiveDisclosureMixin and the related code

Fixes: 63985174
Test: make RunSettingsRoboTests
Change-Id: Ib1d39b2db93d78a56c7adf90abcae5226f9564c2
2017-10-27 13:16:38 -07:00
Doris Ling
6f60cddc9e Add a new feature flag for the expand button in support lib.
- check the feature flag to determine whether to use the existing
progressive disclosure mixin or use the expand button in the support
library.
- add corresponding preference xml files that add the new preference
group attribute to use with the expand button in the support lib.

Bug: 63985174
Test: make RunSettingsRoboTests
Change-Id: Ida6eb6182a8066ad1413b7f6142512345fd914d0
2017-09-15 11:56:31 -07:00
Andrew Sapperstein
fedae393ef Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.

Change-Id: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 13:07:54 -07:00
Andrew Sapperstein
cc7adfd9e0 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am: 63c63ff640
am: 301dfdd8d1

Change-Id: Iab4d5c24b9ac7cee39af3bcc14631fa09bb455c5
2017-06-29 04:52:32 +00:00
Andrew Sapperstein
ebaab6aabd Reduce number of wallpaper results in search.
Previously we indexed the intent in display settings and every
app that handled ACTION_SET_WALLPAPER. Now, we only index an
app that handles ACTION_SET_WALLPAPER and is the listed package in
config_wallpaper_picker_package.

Change-Id: Ife81702017e3e8be4a754873d9c453fddf1cbd9e
Fixes: 62793068
Test: manual, search wallpaper and observe results
2017-06-28 17:16:57 -07:00
Tony Mantler
1d583e125f Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
Romain Guy
305f900bfa Add saturation boost setting
Bug: 62238038 62377592 38225028
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=com.android.settings.display.ColorModePreferenceControllerTest
Change-Id: Iae8f4b25966ff28fde127e6103b2c03c67862cf0
2017-06-06 17:58:24 -07:00
Adrian Roos
e349ec30d8 AOD: Ambient display settings to dedicated settings screen
Bug: 33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
2017-05-30 16:42:37 -07:00
Matthew Fritze
742467ec9f Remove Language and Input duplicates
Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Merge for: ag/2098173/

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: I8bc0776131fcac5a6edf7e8271bc53252c2fc719
2017-05-18 13:57:54 -07:00
Juan Lang
a5f0a82f8f Merge changes from topic 'footer-settingslib'
* changes:
  Depend on SettingsLib's version of lifecycle and FooterMixin.
  Add a factory method to create a Lifecycle.
2017-05-12 20:24:05 +00:00
Juan Lang
777ed2535a Depend on SettingsLib's version of lifecycle and FooterMixin.
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
     && make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
2017-05-12 11:10:46 -07:00
Adrian Roos
95ff1f4131 AOD: Add temporary always-on setting
Adds a setting for controlling always-on ambient display
until the new ambient display settings screen is implemented.

Also updates DozePreferenceController to use the the
AmbientDisplayConfiguration helper instead of recreating that
logic.

Also adds tests for both doze preference controllers.

Bug: 33279975
Test: Toggle "Settings > Display > Always on", verify ambient display is on / off
Test: make RunSettingsRoboTests
Change-Id: If36356bc29329a4e0732e79db662ffb02c9fc189
2017-05-11 17:15:20 -07:00
Fan Zhang
670410c04e Use a SwitchPreference for auto-rotate instead
- Change the UI to SwitchPreference
- Remove old string used by DropDownPreference
- Attach listener to monitor setting change

Change-Id: If42cceb74296814311eb0eff8e26b4a48a1c4d29
Fix: 35959797
Test: robotests
2017-05-06 10:42:37 -07:00
Matthew Fritze
49915a64c5 Remove accessibility duplicates in settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Iae179b558065d728c14eb76f136d398081577779
2017-05-02 17:39:24 +00:00
Doris Ling
2e4ff90f5a Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Change-Id: I611ec77174ab45315ccbee2952bdbc2c9a9cd954
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-27 10:52:31 -07:00
Doris Ling
3248492fd7 Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev am: 024bc8706d
am: 387b8c0f8e

Change-Id: I6f38e2100fbbfa30df6e3719cb66062573e54556
2017-04-27 03:31:07 +00:00
TreeHugger Robot
024bc8706d Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev 2017-04-27 03:22:21 +00:00
Doris Ling
cf4a185aeb DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
This reverts commit 03ee253701.

The change does not work properly and is causing confusion.

Bug: 36650108

Change-Id: I00acced742b20e215c869ed58eb8750c654f5742
2017-04-26 21:33:16 +00:00
TreeHugger Robot
1c7e25d3b6 Merge "Remove duplicates between battery and display settings" into oc-dev 2017-04-22 00:56:09 +00:00
TreeHugger Robot
4d33effa55 Merge "Revert "Listen to brigtness updates to update brightness summary."" 2017-04-21 22:07:14 +00:00
Matthew Fritze
4897eccd5d Revert "Listen to brigtness updates to update brightness summary."
This reverts commit 83e2741bd7.

Change-Id: I93e2cf00ac5ffce7bd4e5951dcbe19c4189ffafd
2017-04-21 20:17:58 +00:00
Matthew Fritze
3266e3d712 Remove duplicates between battery and display settings
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Iaad52f16ce33c478c64bcec656cc8edbe0c97283
Merged-In: I56c82e9e7f163d345065ca478849de9b14c173fe
2017-04-20 11:11:20 -07:00
TreeHugger Robot
8968e61b95 Merge "Remove duplicates between battery and display settings" 2017-04-19 23:05:03 +00:00
Matthew Fritze
c6f2638009 Remove duplicates between battery and display settings
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I56c82e9e7f163d345065ca478849de9b14c173fe
2017-04-19 14:34:13 -07:00
Matthew Fritze
0811fd544b Revert "Listen to brigtness updates to update brightness summary."
This reverts commit 4b95879634.

Change-Id: I13de29b0e42a09f6b3618826d7eb2a9ed00a54d8
Merged-In: I09fd9c843a4d32a131b87cd638785af552f81507
2017-04-19 20:35:36 +00:00
Doris Ling
4b95879634 Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Merged-In: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Change-Id: Ice549ffd708c2dad311a87b6a92bf1c8db426456
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-18 20:01:16 +00:00
Doris Ling
83e2741bd7 Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Bug: 37227609
Test: make RunSettingsRoboTests
Change-Id: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
2017-04-18 11:05:16 -07:00
Doris Ling
03ee253701 Add summary text to Display->Brightness level.
Get the current brightness level from settings provider and set it to
the brightness preference summary.

Change-Id: Ieb4fbc132ec120cf839548f64e9c5f5b52b2f9c2
Fix: 36650108
Test: make RunSettingsRoboTests
2017-04-03 15:26:30 -07:00
Andrew Sapperstein
6138f1ab31 Add double-tap & lift gestures to display settings
Now they're in both languages & input and display.

Change-Id: Ib0d9fa1aa39656662307e2fc8fda70443f1ae8ed
Fixes: 36415612
Test: robotests
2017-03-22 18:20:37 -07:00
Fan Zhang
dc9a82f5b0 Fix a crash when resuming sound setting with AfW on Ryu
Also renamed a few xmls

Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a
Fix: 36357493
Test: make RunSettingsRoboTests
2017-03-16 11:26:33 -07:00
Fan Zhang
b00811da64 Let fragment and indexProvider share prefControllers
Bug: 35812240
Test: make RunSettingsRoboTests
Change-Id: Ifd96f935836a52e0a56f170f3cdf9b9ddf7c499a
2017-03-01 12:56:58 -08:00
Doris Ling
c626f00b01 Remove old code from DisplaySettings not used in new IA.
- removed the old display settings xml
- merge DisplayDashboard metadata into DisplaySettingsActivity instead
and remove DisplayDashboard.

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I9280c9b5c586acd9d97602b0fb12025fafca8af5
2017-02-28 11:52:55 -08:00
Fan Zhang
7520e81ab5 Update top level menu items summary text.
- Use static summary for most items
- Move summary for user setting to user&account setting

Bug: 34975053
Test: RunSettingsRoboTests
Change-Id: I9bf87267778dc5933f97f5d3b9ae0f4f0b8da1a8
2017-02-09 15:22:47 -08:00
TreeHugger Robot
b692056232 Merge "Add Adaptive brightness as an inline result in Search" 2017-02-07 20:12:37 +00:00
Matthew Fritze
516b0f1b83 Add Adaptive brightness as an inline result in Search
Bug: 34740449
Test: make RunSettingsRoboTests
Change-Id: I71acdcc04780a76263171a9d312d88a1eb61624a
2017-02-06 17:49:34 -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
Fan Zhang
7e6df837ee Remove getCategoryKey() from DashboardFragment children.
Use the centralized registry to look up category key instead.

Bug: 32936784
Test: make RunSettingsRoboTests -j40
Change-Id: I0b8c72d70f93e4b5c58871ac90de41f69ad15653
2017-01-24 14:51:15 -08:00
Fan Zhang
d916dae218 Progressive disclosure on selected UIs: app, display
Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: I1651433ba30a2b5f880095e07b5e2ed9c4e308b9
2017-01-07 11:21:06 -08:00
Tamas Berghammer
265d3c2a0c Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
2016-11-08 14:06:17 +00:00
Fan Zhang
99abc025b9 Reorder prefs in display settings for new info architecture
Bug: 31800242
Test: Visual inspection
Change-Id: I0cd0e7464eb05881a9b27e726caa1b1e0d211fb6
2016-10-11 14:50:31 -07:00
Fan Zhang
66b573ad5a Add display settings dashboard to new IA.
- Added a activity-alias pointing to displaySettings as top level
  setting item.
- Refactored all preference logic in DisplaySettings into
  PreferenceControllers. During fragment onAttach it installs all
  controllers, and during onResume it updates preference state. Each
  controller listens to its own preference change event.

Bug: 31800242
Test: RunSettingsRoboTests
Change-Id: Ibc9bf200c5acce7c4ae9292340822afee27a3a28
2016-10-10 18:26:29 -07:00
Doris Ling
ff46067437 Fix build error in DisplaySettings
Add static import for android.provider.Settings.Secure.DOZE_ENABLED

Test: make pass
Bug: 31716184
Change-Id: Ia958b3089f3d52897b09072d0dfe4a472176ff89
2016-09-23 20:27:48 -07:00
Doris Ling
430025c4d6 Split Ambient Display settings. am: 1ad58d0abf am: f89766dbab
am: 0dfe46fe58

Change-Id: I33ffaa71c09cff7a4df496c42371519367e1772c
2016-09-24 00:35:24 +00:00
Doris Ling
1ad58d0abf Split Ambient Display settings.
1. Reverting the changes for Display->Ambient Display; this setting
   will control incoming notification pulse.
2. Added 2 separate entries in gestures settings to control pick up
   and double tap gestures-triggered pulsing for Ambient Display.
3. Added automated tests to verify the preference initializes to the
   correct default value, and also verify that toggling the preference
   updates the corresponding settings correctly.

Test: make SettingsTests

Bug: 30595437
Change-Id: I125bf75fc4ccfea126a00ffae4207fcb789f487a
2016-09-23 15:33:37 -07:00
Fan Zhang
aa71afe597 Use MetricsFeatureProvider for logging in Settings.
Bug: 31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
      verifying log

Change-Id: Id944be7c4ff9911aebee481c2df485542f1318f0
2016-09-23 08:37:37 -07:00
Stephen Chen
2b98ffaab8 Change Display summary to sleep timeout description.
Bug: 29579542
Fixes: 29579542
Change-Id: I4e122bd6972fde933229768cba86302eb4d3f7c6
Test: Added Robo test, manually tested
2016-09-22 13:55:32 -07:00
Doris Ling
d0c7de09f0 Re-enable Ambient Display double tab. am: fec320324c am: 6bc8858379
am: 5d4c701707

Change-Id: I01c2e3a4a207f0338744228171a0cee7ff6bfbab
2016-08-27 00:33:28 +00:00