Bill Yi
a8dc2a8f75
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: fef593ca43 -s ours
...
am: 70360ed230
2017-10-27 08:05:44 +00:00
Bill Yi
70360ed230
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: fef593ca43
2017-10-27 08:00:14 +00:00
TreeHugger Robot
fef593ca43
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-10-27 07:55:00 +00:00
Bill Yi
0a8a5de744
Import translations. DO NOT MERGE am: 09bd03ba04 -s ours am: 1919e72747 -s ours
...
am: 02ec9a9903
2017-10-27 07:53:47 +00:00
Bill Yi
02ec9a9903
Import translations. DO NOT MERGE am: 09bd03ba04 -s ours
...
am: 1919e72747
2017-10-27 07:48:14 +00:00
Bill Yi
1919e72747
Import translations. DO NOT MERGE
...
am: 09bd03ba04
2017-10-27 07:41:44 +00:00
Christine Franks
39ead1c0ff
Move color mode to DisplayTransformManager am: 3d1d4a6628 -s ours am: 755f07519a -s ours
...
am: c854bf6a3f
2017-10-27 04:29:22 +00:00
Bill Yi
09bd03ba04
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98
2017-10-26 21:16:36 -07:00
Bill Yi
99826ce0ab
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I35ac0b6a330fb71bc2aa0020ae8417664345e213
2017-10-26 21:10:31 -07:00
Christine Franks
c854bf6a3f
Move color mode to DisplayTransformManager am: 3d1d4a6628 -s ours
...
am: 755f07519a
2017-10-27 03:59:08 +00:00
TreeHugger Robot
85fb6726e9
Merge "Search in Settings for Japanese"
2017-10-27 03:31:46 +00:00
Christine Franks
755f07519a
Move color mode to DisplayTransformManager
...
am: 3d1d4a6628
2017-10-27 03:23:14 +00:00
TreeHugger Robot
b40d1db1ae
Merge "Call SuggestionService.launch when click suggestion."
2017-10-27 01:24:31 +00:00
Suzuki Yuka
75664c6e02
Search in Settings for Japanese
...
Normalize Hiragana and Katakana in Settings search.
Fixes: 28410478
Test: manual - set the device language to Japanese
and search in Settings.
Test: manual
Change-Id: Iee76da6a895ea006959c23f4eb64f62af0917c34
2017-10-26 18:15:17 -07:00
Fan Zhang
6d9e2a3f99
Add strings to support multi-state vivid color management am: a12b3d318d am: beef67ec74
...
am: 64d6c6bb48
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
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
2017-10-27 00:43:11 +00:00
Fan Zhang
64d6c6bb48
Add strings to support multi-state vivid color management am: a12b3d318d
...
am: beef67ec74
2017-10-27 00:24:44 +00:00
Bill Yi
35aec82297
Import translations. DO NOT MERGE am: 68d7f87f78 -s ours
...
am: ac8f283a8a
2017-10-27 00:24:23 +00:00
Romain Guy
3aa7b9fcbc
Add new color mode setting am: 9143fb26b4 -s ours
...
am: 298adb9b54
2017-10-27 00:24:11 +00:00
Fan Zhang
beef67ec74
Add strings to support multi-state vivid color management
...
am: a12b3d318d
2017-10-27 00:08:51 +00:00
Bill Yi
ac8f283a8a
Import translations. DO NOT MERGE
...
am: 68d7f87f78
2017-10-27 00:08:39 +00:00
Romain Guy
298adb9b54
Add new color mode setting
...
am: 9143fb26b4
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
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
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
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
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
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
2017-10-25 04:55:14 +00:00
Chia-I Wu
c892a3cfc9
Merge "Add new color mode setting" into oc-mr1-dev
...
am: 94aa05059d
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
