Commit Graph

19938 Commits

Author SHA1 Message Date
Doris Ling
ed4685fafb Update activity titles for fragments without preference screen.
1. Move getPreferenceScreenResId() from individual subclass to
InstrumentedPreferenceFragment.

2. Removed InstrumentedPreferenceFragment.getTitle() and let the
preference fragments that do not have preference screen set the activity
title directly instead.

3. Removed OptionsMenuFragment as all it does is call
setHasOptionMenu().
- changed subclasses of OptionsMenuFragment to extend from
InstrumentedPreferenceFragment directly.
- none of the exisitng subclasses actually implements the option menu
related methods to provide any option menu. So, the setHasOptionMenu()
call is not added to the subclasses.

4. Update Languages preference title.
- launch the fragment from the preference controller instead of from the
default handling, as we need the title res id at launch time to get it
work properly when retrieving the title from back stack.

Bug: 64564191
Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots
Change-Id: Ibecdcab32cbaed8bf604ec5ebe0a926b4e489a7d
2017-10-26 12:01:06 -07:00
Fan Zhang
f2b3825a09 Merge "Add a test to enforce unique id for preferences (in search)" 2017-10-26 18:50:05 +00:00
Xiangyu/Malcolm Chen
861b6dda26 Merge "Revert "Delete unused classes"" 2017-10-26 17:59:27 +00:00
Xiangyu/Malcolm Chen
d254d4603f Merge "MSIM support for Wi-Fi calling setting." 2017-10-26 17:59:27 +00:00
Jeffrey Huang
9e1570c5f3 Merge "Introduce MemoryUsagePreferenceController" 2017-10-26 16:51:07 +00:00
Fan Zhang
7765067f33 Add a test to enforce unique id for preferences (in search)
Change-Id: I007ad2b9bf381c601f9375f14e32d4e2bc086942
Fixes: 67852637
Test: is a test
2017-10-26 09:47:35 -07:00
Qi Ding
4ca4bd31c3 Fix current tab is changed when rotating device
Even if SIM slot 2 is selected in SIM card lock settings,
the current tab is changed to SIM slot 1 when rotating the device.
To fix this issue, the current tab should be restored
after rotating the device.

Fixes: 63690125
Test: manual - go to Settings > Security > SIM card lock
               and rotate device

Change-Id: I874d4d06019e21dd7b65951a3aefb75ff5ea298b
2017-10-26 14:39:03 +09:00
TreeHugger Robot
2bb74379e5 Merge "Update preference screen title." 2017-10-25 20:30:31 +00:00
Christine Franks
7f3176aceb DO NOT MERGE - Move color mode to DisplayTransformManager
am: cd2b7aea5f

Change-Id: I1ebad738c64493b1929b2eb299b41c1bb365f6fe
2017-10-25 20:23:06 +00:00
jackqdyulei
88a4b0b0e5 Move the bluetooth icon logic to settingslib
This cl contains the moving about:
1. Several methods in Bluetooth/Utils.java
2. Bluetooth icon drawables
3. Bluetooth strings
4. Tests

Bug: 65488978
Test: RunSettingslibRoboTests

Change-Id: I682daa3eeb5022beb90a95763c70d19d32d54915
2017-10-25 12:49:59 -07:00
Christine Franks
cd2b7aea5f DO NOT MERGE - Move color mode to DisplayTransformManager
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100

Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
2017-10-25 12:42:23 -07:00
Malcolm Chen
13d50cb0f5 MSIM support for Wi-Fi calling setting.
UI change to support Wi-Fi calling settings for multi-SIM devices.

Bug: b/65648147
Test: manual
Change-Id: Ia2e3a835400873bf6d8bfc7a7690d98e74049076
2017-10-25 11:48:23 -07:00
Doris Ling
03a3b518de Update preference screen title.
- Add missing title to preference screen xml so that they will be used to
set the activity title when the fragment is launched.
- Also updated some incorrect preference screen titles.
- Overrides getTitle() in preference fragments that do not use the
preference screen xml.

Bug: 64564191
Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots
Change-Id: Id72d5ddf18f0962bc484de8bbd847a2e55d6371e
2017-10-25 11:02:07 -07:00
Jeffrey Huang
9d31fa4c8f Merge "Update DeviceModelPreferenceController" 2017-10-25 17:17:08 +00:00
Fan Zhang
f2ba1167c5 Merge "Only allow Settings app launch search result page" 2017-10-25 16:47:44 +00:00
Chia-I Wu
c60a52b9aa Merge "Add new color mode setting" into oc-mr1-dev am: 94aa05059d
am: c892a3cfc9

Change-Id: I971cf848dd70597c97270a008912c099c6bd24db
2017-10-25 04:55:14 +00:00
Chia-I Wu
c892a3cfc9 Merge "Add new color mode setting" into oc-mr1-dev
am: 94aa05059d

Change-Id: I31d9b51c1299564546a61a708f2058a815dd2974
2017-10-25 04:38:57 +00:00
TreeHugger Robot
2f83dc76b6 Merge "Rename files for consistency." 2017-10-25 02:36:36 +00:00
Daniel Finchelstein
9c07451786 Rename files for consistency.
Test: CTS (API2 tests)

Change-Id: I8a079525499e564c438281fcf5b3ef8333925f5b
2017-10-24 17:54:33 -07:00
jeffreyhuang
c57f18d853 Introduce MemoryUsagePreferenceController
- Use a hard-coded preference instead of injecting
 so that search can index the preference
 - Create a preference controller to update the summary

Change-Id: Idf822ccbb7a58a9ec561d5c2c2948dbc3272544f
fixes: 36463051
Test: Manual using settings app
2017-10-24 16:52:36 -07:00
Fan Zhang
25f29bf126 Only allow Settings app launch search result page
Bug: 68199963
Test: robotest
Change-Id: I0018e9c60b0dd46fc2420a563a93b706bf252dc4
2017-10-24 16:27:47 -07:00
Romain Guy
05fa18f847 Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)

The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).

Bug: 68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
2017-10-24 22:19:09 +01:00
Fan Zhang
9184c48c3e Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29 am: e373209b97
am: 614f7aafdc

Change-Id: Iafee32f071387ac36faa42cc9e3812109f769a8b
2017-10-24 20:50:40 +00:00
Fan Zhang
614f7aafdc Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29
am: e373209b97

Change-Id: I67452d72f814fc0a1f11fd7699a1134f03a00a6f
2017-10-24 20:41:16 +00:00
Fan Zhang
e373209b97 Merge "Fix wrong position of cursor in OwnerInfoSettings"
am: 2bcbc35b29

Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6
2017-10-24 20:33:03 +00:00
Bill Yi
aa8a972ea3 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2017-10-24 11:32:26 -07:00
Fan Zhang
89b8e5c103 Deprecate resId field in SearchIndexableResources
Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd
Bug: 37741509
Test: robotests
2017-10-24 09:59:16 -07:00
tiansiming
7206a2998d Fix wrong position of cursor in OwnerInfoSettings
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.

Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-10-24 17:19:27 +08:00
Rajeev Kumar
331a4459f0 resolve merge conflicts of ac0fd76521 to master
Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.
2017-10-23 22:36:09 -07:00
Rajeev Kumar
ac0fd76521 Remove SearchIndexProvider from DataPlanUsageSummary fragment.
am: dd8e66fa20

Change-Id: I0b27a9c68a17f87876d477bad0d10b270aecd550
2017-10-24 05:01:49 +00:00
Rajeev Kumar
dd8e66fa20 Remove SearchIndexProvider from DataPlanUsageSummary fragment.
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.

Bug: 68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
2017-10-23 21:51:02 -07:00
TreeHugger Robot
3ec4dcb5f6 Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib" 2017-10-24 00:27:55 +00:00
TreeHugger Robot
74ab2fff66 Merge "Deprecate Icons from SearchIndexableResources" 2017-10-23 23:15:02 +00:00
Daniel Finchelstein
5d0fc58af0 Merge "Revert "Revert "Settings: Enable HAL HDR+ by default""" 2017-10-23 22:54:06 +00:00
Tony Mantler
d9af0b839d Move SimStatus and ImeiInfo Pref Controllers to SettingsLib
Bug: 67410808
Test: RunSettingsRoboTests
Change-Id: Ib55d2365814b5882f7fcae6bb7f1b62cc3d6ad4e
2017-10-23 15:42:43 -07:00
Fan Zhang
f183b6870c Deprecate Icons from SearchIndexableResources
Change-Id: Ic1b9fa1cf5c7ab171b645565a9db5db1993ac85f
Fixes: 38027997
Test: robotests
2017-10-23 14:31:34 -07:00
Doris Ling
2e950fca63 Set uninstall button to gray color.
For user installed app, set the uninstall button as negative button so
that it will have the correct color.

Change-Id: Ic631386affddf82ae0ebbf29fb572de1f067fc90
Fixes: 68154647
Test: make RunSettingsRoboTests
2017-10-23 14:05:45 -07:00
Chien-Yu Chen
e96571d106 Revert "Revert "Settings: Enable HAL HDR+ by default""
This reverts commit 781e762c2c.

Also updated the V2 version, which was not in the original revert CL.

Test: CTS
Bug: 67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
2017-10-23 13:30:57 -07:00
TreeHugger Robot
9d85cfe762 Merge "Set activity title from preference screen title." 2017-10-21 00:07:39 +00:00
TreeHugger Robot
4776e0e1cd Merge "Adding new methods to FakeUid." 2017-10-20 23:22:40 +00:00
TreeHugger Robot
988c82ea3b Merge "Fix crash from Settings Search" 2017-10-20 23:00:42 +00:00
Doris Ling
1a6887bbd3 Set activity title from preference screen title.
- When we initialize the preference screen, if the screen title is
available, use that to set the activity title, so that it will be up to
date with dynamic language changes.
- for preference fragment that don't have preference screen xml, added a
getTitle() method for the fragment to provide the title explicitly.
- use feature flag to switch between the old and new mechanism for
handling activity title.

Bug: 64564191
Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots
Change-Id: I96318a5aa81e7b8ca94118adac3245ed27a03d93
2017-10-20 22:46:12 +00:00
Treehugger Robot
60d6ffbc6c Merge "Refactored area update info support" 2017-10-20 19:19:09 +00:00
TreeHugger Robot
04d9769c0e Merge "Switch the buttons in bt detail page" 2017-10-20 17:55:37 +00:00
TreeHugger Robot
012fe11939 Merge "Catch exception when checking WifiDisplay availability" 2017-10-20 16:55:37 +00:00
Jeffrey Huang
78c09dfb20 Merge changes Icddb9d35,I36f76f93,Ie7b6afa5
* changes:
  Add existing controllers in about phone to v2 fork
  Create XML layout for about phone v2
  Fork a new about phone layout
2017-10-20 16:45:51 +00:00
Ben Schwartz
1887caef9d Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a am: 1fd46833ef
am: 2372074d57

Change-Id: I0ae492cccd6c7031abab23cc77310e09c04a6872
2017-10-20 15:46:01 +00:00
Ben Schwartz
2372074d57 Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a
am: 1fd46833ef

Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
2017-10-20 15:33:50 +00:00
Ben Schwartz
1fd46833ef Merge "Add a developer option for controlling DNS over TLS" am: c8207de343
am: ed97eaeb4a

Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
2017-10-20 15:15:14 +00:00
Ben Schwartz
ed97eaeb4a Merge "Add a developer option for controlling DNS over TLS"
am: c8207de343

Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
2017-10-20 15:06:10 +00:00