Commit Graph

41010 Commits

Author SHA1 Message Date
Fan Zhang
823dde54c7 Misc clean up in search
- Remove updateFromClassNameResource() because it's just a no-op method.
- Simplify SearchIndexResources
- Update some pref pages to have unique keys.

Change-Id: I51e542d9947aafd046861ce7be0b4c7213fcd01d
Fixes: 64951285
Test: UniquePreferenceKeyTest
Test: robotest
Bug: 67852637
2017-10-26 17:54:45 -07:00
Doris Ling
73bce67552 Update title string for Swipe gesture screen.
- Add a shorter version of the swipe fingerprint string to be used as
the preference screen title.

Change-Id: I76cdf19d2377f58eb52bf6d44116900d2a5c2e7b
Fixes: 68061630
Test: visual
2017-10-26 15:02:15 -07:00
TreeHugger Robot
471bc86ae6 Merge "Update activity titles for fragments without preference screen." 2017-10-26 21:14:01 +00:00
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
Jeffrey Huang
6bd610cdcf Merge "Changed assist summary from "None" -> Empty" 2017-10-26 16:50:42 +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
jeffreyhuang
bb2911c029 Changed assist summary from "None" -> Empty
- Updated summary so that search no longer displays none

Change-Id: I1c2e666f609dcae34f225f8f833d87b5cb20e74e
Fixes: 37160315
Test: Manual using settings app
2017-10-25 15:05:47 -07:00
Christine Franks
609b336d05 DO NOT MERGE - Move color mode to DisplayTransformManager am: cd2b7aea5f
am: 7f3176aceb  -s ours

Change-Id: I8c3c1858f03f13104d60f4b58de3bb2189f76248
2017-10-25 20:37:22 +00: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
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
Chia-I Wu
94aa05059d Merge "Add new color mode setting" into oc-mr1-dev 2017-10-25 04:28:59 +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
Bill Yi
63e09f1f8e Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3 am: 2ef76cb0d2
am: 17a1b4e1fc

Change-Id: Ia8ad6a2475329fca2431ef99a9b890c8ec5502e5
2017-10-24 20:51:44 +00: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
Bill Yi
17a1b4e1fc Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3
am: 2ef76cb0d2

Change-Id: I906612380c00db46a4d71e8aeceb822af857f744
2017-10-24 20:42:12 +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
Bill Yi
2ef76cb0d2 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: aa8a972ea3

Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93
2017-10-24 20:33:44 +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
41c4483909 Import translations. DO NOT MERGE am: 66ecad49ba -s ours
am: 18fea4f0c3  -s ours

Change-Id: I186526954502d5b71e4d847e3d6614486bdd8da0
2017-10-24 20:05:39 +00:00
Bill Yi
18fea4f0c3 Import translations. DO NOT MERGE
am: 66ecad49ba  -s ours

Change-Id: I46bc589e7ad984e910b5ebfc118614d0d1b0bee0
2017-10-24 20:03:09 +00:00
TreeHugger Robot
01ff9a80d0 Merge "Deprecate resId field in SearchIndexableResources" 2017-10-24 18:42: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
2bcbc35b29 Merge "Fix wrong position of cursor in OwnerInfoSettings" 2017-10-24 18:13:25 +00:00
Bill Yi
66ecad49ba Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
2017-10-24 10:24:03 -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
Jeffrey Huang
f253f0e10d Merge "Reduce padding so that view is no longer hidden" 2017-10-24 16:52:12 +00: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
Fan Zhang
43ff3b4202 Add strings to support multi-state vivid color management am: e1543a3895
am: bb6efe3743

Change-Id: Ie33e65251265406cfb80d4a46e0fff4c6915d161
2017-10-24 00:29:14 +00:00
TreeHugger Robot
3ec4dcb5f6 Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib" 2017-10-24 00:27:55 +00:00
Fan Zhang
bb6efe3743 Add strings to support multi-state vivid color management
am: e1543a3895

Change-Id: Icc99c1e3348425d70fea3235a4d4c63385c3d38f
2017-10-24 00:27:02 +00:00
Fan Zhang
e1543a3895 Add strings to support multi-state vivid color management
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
2017-10-23 23:45:47 +00:00
TreeHugger Robot
74ab2fff66 Merge "Deprecate Icons from SearchIndexableResources" 2017-10-23 23:15:02 +00:00