Commit Graph

41682 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
Fan Zhang
6d9e2a3f99 Add strings to support multi-state vivid color management am: a12b3d318d am: beef67ec74
am: 64d6c6bb48

Change-Id: I61ea7b3c6f48d2f2a25755994dfaedc59354dc86
2017-10-27 00:43:52 +00:00
Bill Yi
51f1f8d8bb Import translations. DO NOT MERGE am: 68d7f87f78 -s ours am: ac8f283a8a -s ours
am: 35aec82297  -s ours

Change-Id: Ia98ac86240db593af4b06148e52b2d6b3bf4fff0
2017-10-27 00:43:24 +00:00
Romain Guy
62390b172e Add new color mode setting am: 9143fb26b4 -s ours am: 298adb9b54 -s ours
am: 3aa7b9fcbc  -s ours

Change-Id: I6626f7c8e8c6ddd9a1ea1fea4b8ff364ef24baeb
2017-10-27 00:43:11 +00:00
Fan Zhang
64d6c6bb48 Add strings to support multi-state vivid color management am: a12b3d318d
am: beef67ec74

Change-Id: I7493933bd61172b37104a63bb620bc5e2f48398c
2017-10-27 00:24:44 +00:00
Bill Yi
35aec82297 Import translations. DO NOT MERGE am: 68d7f87f78 -s ours
am: ac8f283a8a  -s ours

Change-Id: Idba1414c734145617f9b0897250865e70db94ad4
2017-10-27 00:24:23 +00:00
Romain Guy
3aa7b9fcbc Add new color mode setting am: 9143fb26b4 -s ours
am: 298adb9b54  -s ours

Change-Id: Ib51b8ca62951543de531080295f8a32ab18e793a
2017-10-27 00:24:11 +00:00
Fan Zhang
beef67ec74 Add strings to support multi-state vivid color management
am: a12b3d318d

Change-Id: I8d47a1c0982d6159cbeb7f7ee74241b4134e6f5a
2017-10-27 00:08:51 +00:00
Bill Yi
ac8f283a8a Import translations. DO NOT MERGE
am: 68d7f87f78  -s ours

Change-Id: I408c19b81f14324b9d445f1a90a087b413583b7d
2017-10-27 00:08:39 +00:00
Romain Guy
298adb9b54 Add new color mode setting
am: 9143fb26b4  -s ours

Change-Id: I0ba85e94b8cbc85868949f1ed9f7d68242e1eb0b
2017-10-27 00:08:33 +00:00
Fan Zhang
8052ac0b36 Call SuggestionService.launch when click suggestion.
Bug: 68267490
Test: robotests
Change-Id: I8614f256fc1a87395b5c9d41e3621164a2ded5e1
2017-10-26 15:23:49 -07:00
jackqdyulei
d65bb52dc8 Don't consider managedProfile in PowerUsageAdvanced
When calculating how many uses exists, we shouldn't count the
managedProfile since this is not the normal user.

Bug: 37681923
Test: RunSettingsRoboTests
Change-Id: Ic24e98f8e8696530d534bc9e1d8f675ad6ad5063
2017-10-26 15:08:50 -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
Christine Franks
dd811e246b Move color mode to DisplayTransformManager
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: I1eb599bfec8e1841af43c43ca1c505233cb87c3d
2017-10-26 14:10:23 -07:00
Christine Franks
3d1d4a6628 Move color mode to DisplayTransformManager
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100

Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
2017-10-26 13:11:58 -07: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
Fan Zhang
a12b3d318d Add strings to support multi-state vivid color management
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit e1543a3895)
2017-10-26 10:10:46 -07:00
Bill Yi
68d7f87f78 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
2017-10-26 10:10:45 -07:00
Romain Guy
9143fb26b4 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
Merged-In: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit 05fa18f847)
2017-10-26 10:09:34 -07: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
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
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
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
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