OSDN Git Service
TreeHugger Robot [Fri, 27 Oct 2017 15:23:19 +0000 (15:23 +0000)]
Merge "Moved zenMode visual effects + automatic rule page"
Beverly [Mon, 2 Oct 2017 13:45:48 +0000 (09:45 -0400)]
Moved zenMode visual effects + automatic rule page
- Automatic zen rules have their own page like in N
- Minor string changes to page and add rule dialog
- Zen mode visual effects was moved into behavior settings
Bug:
63077372
Test: $ make SettingsUnitTests -j40
$ adb install -r ${OUT}/data/app/SettingsUnitTests/SettingsUnitTests.apk
$ adb shell am instrument -w com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I9635f8f7969b76d036bc06ec44705815e540777a
Bill Yi [Fri, 27 Oct 2017 08:05:44 +0000 (08:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
fef593ca43 -s ours
am:
70360ed230 -s ours
Change-Id: I9bf7f22483ad2e4923aa83839786e9955cee09e7
Bill Yi [Fri, 27 Oct 2017 08:00:14 +0000 (08:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
fef593ca43 -s ours
Change-Id: I69b5120d889d669598215e276588500e340d4e26
TreeHugger Robot [Fri, 27 Oct 2017 07:55:00 +0000 (07:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 27 Oct 2017 07:53:47 +0000 (07:53 +0000)]
Import translations. DO NOT MERGE am:
09bd03ba04 -s ours am:
1919e72747 -s ours
am:
02ec9a9903 -s ours
Change-Id: I43e621e95492a08b03f0cc82a2b913fe3b9b20dc
Bill Yi [Fri, 27 Oct 2017 07:48:14 +0000 (07:48 +0000)]
Import translations. DO NOT MERGE am:
09bd03ba04 -s ours
am:
1919e72747 -s ours
Change-Id: Ic4e18896e1855f115a03a99a87118e422e2edce0
Bill Yi [Fri, 27 Oct 2017 07:41:44 +0000 (07:41 +0000)]
Import translations. DO NOT MERGE
am:
09bd03ba04 -s ours
Change-Id: I6ff0a464ed719315f276e794f0851541b200691c
Christine Franks [Fri, 27 Oct 2017 04:29:22 +0000 (04:29 +0000)]
Move color mode to DisplayTransformManager am:
3d1d4a6628 -s ours am:
755f07519a -s ours
am:
c854bf6a3f -s ours
Change-Id: I5c31d3afcdd2b0f3c2e87fbe2b8cb2f64d64f56f
Bill Yi [Fri, 27 Oct 2017 04:16:36 +0000 (21:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98
Bill Yi [Fri, 27 Oct 2017 04:10:31 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I35ac0b6a330fb71bc2aa0020ae8417664345e213
Christine Franks [Fri, 27 Oct 2017 03:59:08 +0000 (03:59 +0000)]
Move color mode to DisplayTransformManager am:
3d1d4a6628 -s ours
am:
755f07519a -s ours
Change-Id: I48234909c67c04a2ed81bef314faab08a82cbfe7
TreeHugger Robot [Fri, 27 Oct 2017 03:31:46 +0000 (03:31 +0000)]
Merge "Search in Settings for Japanese"
Christine Franks [Fri, 27 Oct 2017 03:23:14 +0000 (03:23 +0000)]
Move color mode to DisplayTransformManager
am:
3d1d4a6628 -s ours
Change-Id: I7064dbf657bf93f80f863b6b0e963cb793752194
TreeHugger Robot [Fri, 27 Oct 2017 01:24:31 +0000 (01:24 +0000)]
Merge "Call SuggestionService.launch when click suggestion."
Suzuki Yuka [Fri, 26 Sep 2014 04:31:39 +0000 (13:31 +0900)]
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
Fan Zhang [Fri, 27 Oct 2017 00:43:52 +0000 (00:43 +0000)]
Add strings to support multi-state vivid color management am:
a12b3d318d am:
beef67ec74
am:
64d6c6bb48
Change-Id: I61ea7b3c6f48d2f2a25755994dfaedc59354dc86
Bill Yi [Fri, 27 Oct 2017 00:43:24 +0000 (00:43 +0000)]
Import translations. DO NOT MERGE am:
68d7f87f78 -s ours am:
ac8f283a8a -s ours
am:
35aec82297 -s ours
Change-Id: Ia98ac86240db593af4b06148e52b2d6b3bf4fff0
Romain Guy [Fri, 27 Oct 2017 00:43:11 +0000 (00:43 +0000)]
Add new color mode setting am:
9143fb26b4 -s ours am:
298adb9b54 -s ours
am:
3aa7b9fcbc -s ours
Change-Id: I6626f7c8e8c6ddd9a1ea1fea4b8ff364ef24baeb
Fan Zhang [Fri, 27 Oct 2017 00:24:44 +0000 (00:24 +0000)]
Add strings to support multi-state vivid color management am:
a12b3d318d
am:
beef67ec74
Change-Id: I7493933bd61172b37104a63bb620bc5e2f48398c
Bill Yi [Fri, 27 Oct 2017 00:24:23 +0000 (00:24 +0000)]
Import translations. DO NOT MERGE am:
68d7f87f78 -s ours
am:
ac8f283a8a -s ours
Change-Id: Idba1414c734145617f9b0897250865e70db94ad4
Romain Guy [Fri, 27 Oct 2017 00:24:11 +0000 (00:24 +0000)]
Add new color mode setting am:
9143fb26b4 -s ours
am:
298adb9b54 -s ours
Change-Id: Ib51b8ca62951543de531080295f8a32ab18e793a
Fan Zhang [Fri, 27 Oct 2017 00:08:51 +0000 (00:08 +0000)]
Add strings to support multi-state vivid color management
am:
a12b3d318d
Change-Id: I8d47a1c0982d6159cbeb7f7ee74241b4134e6f5a
Bill Yi [Fri, 27 Oct 2017 00:08:39 +0000 (00:08 +0000)]
Import translations. DO NOT MERGE
am:
68d7f87f78 -s ours
Change-Id: I408c19b81f14324b9d445f1a90a087b413583b7d
Romain Guy [Fri, 27 Oct 2017 00:08:33 +0000 (00:08 +0000)]
Add new color mode setting
am:
9143fb26b4 -s ours
Change-Id: I0ba85e94b8cbc85868949f1ed9f7d68242e1eb0b
Fan Zhang [Fri, 20 Oct 2017 17:23:48 +0000 (10:23 -0700)]
Call SuggestionService.launch when click suggestion.
Bug:
68267490
Test: robotests
Change-Id: I8614f256fc1a87395b5c9d41e3621164a2ded5e1
Doris Ling [Thu, 26 Oct 2017 22:02:15 +0000 (15:02 -0700)]
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
TreeHugger Robot [Thu, 26 Oct 2017 21:14:01 +0000 (21:14 +0000)]
Merge "Update activity titles for fragments without preference screen."
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Doris Ling [Wed, 25 Oct 2017 21:08:57 +0000 (14:08 -0700)]
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
Fan Zhang [Thu, 26 Oct 2017 18:50:05 +0000 (18:50 +0000)]
Merge "Add a test to enforce unique id for preferences (in search)"
Xiangyu/Malcolm Chen [Thu, 26 Oct 2017 17:59:27 +0000 (17:59 +0000)]
Merge "Revert "Delete unused classes""
Xiangyu/Malcolm Chen [Thu, 26 Oct 2017 17:59:27 +0000 (17:59 +0000)]
Merge "MSIM support for Wi-Fi calling setting."
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit
e1543a3895a3b0b3af1ac1580b2d5a893ac119a7)
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
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
05fa18f8474cd5fed798e7ee7ef099682c4a4475)
Jeffrey Huang [Thu, 26 Oct 2017 16:51:07 +0000 (16:51 +0000)]
Merge "Introduce MemoryUsagePreferenceController"
Jeffrey Huang [Thu, 26 Oct 2017 16:50:42 +0000 (16:50 +0000)]
Merge "Changed assist summary from "None" -> Empty"
Fan Zhang [Wed, 25 Oct 2017 00:35:34 +0000 (17:35 -0700)]
Add a test to enforce unique id for preferences (in search)
Change-Id: I007ad2b9bf381c601f9375f14e32d4e2bc086942
Fixes:
67852637
Test: is a test
jeffreyhuang [Tue, 24 Oct 2017 23:57:28 +0000 (16:57 -0700)]
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
Christine Franks [Wed, 25 Oct 2017 20:37:22 +0000 (20:37 +0000)]
DO NOT MERGE - Move color mode to DisplayTransformManager am:
cd2b7aea5f
am:
7f3176aceb -s ours
Change-Id: I8c3c1858f03f13104d60f4b58de3bb2189f76248
TreeHugger Robot [Wed, 25 Oct 2017 20:30:31 +0000 (20:30 +0000)]
Merge "Update preference screen title."
Christine Franks [Wed, 25 Oct 2017 20:23:06 +0000 (20:23 +0000)]
DO NOT MERGE - Move color mode to DisplayTransformManager
am:
cd2b7aea5f
Change-Id: I1ebad738c64493b1929b2eb299b41c1bb365f6fe
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
DO NOT MERGE - Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Malcolm Chen [Fri, 22 Sep 2017 18:58:02 +0000 (11:58 -0700)]
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
Doris Ling [Wed, 18 Oct 2017 21:25:01 +0000 (14:25 -0700)]
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
Jeffrey Huang [Wed, 25 Oct 2017 17:17:08 +0000 (17:17 +0000)]
Merge "Update DeviceModelPreferenceController"
Fan Zhang [Wed, 25 Oct 2017 16:47:44 +0000 (16:47 +0000)]
Merge "Only allow Settings app launch search result page"
Chia-I Wu [Wed, 25 Oct 2017 04:55:14 +0000 (04:55 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev am:
94aa05059d
am:
c892a3cfc9
Change-Id: I971cf848dd70597c97270a008912c099c6bd24db
Chia-I Wu [Wed, 25 Oct 2017 04:38:57 +0000 (04:38 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev
am:
94aa05059d
Change-Id: I31d9b51c1299564546a61a708f2058a815dd2974
Chia-I Wu [Wed, 25 Oct 2017 04:28:59 +0000 (04:28 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev
TreeHugger Robot [Wed, 25 Oct 2017 02:36:36 +0000 (02:36 +0000)]
Merge "Rename files for consistency."
Daniel Finchelstein [Tue, 24 Oct 2017 17:30:35 +0000 (10:30 -0700)]
Rename files for consistency.
Test: CTS (API2 tests)
Change-Id: I8a079525499e564c438281fcf5b3ef8333925f5b
jeffreyhuang [Fri, 20 Oct 2017 21:10:25 +0000 (14:10 -0700)]
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
Fan Zhang [Tue, 24 Oct 2017 16:27:02 +0000 (09:27 -0700)]
Only allow Settings app launch search result page
Bug:
68199963
Test: robotest
Change-Id: I0018e9c60b0dd46fc2420a563a93b706bf252dc4
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
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
Bill Yi [Tue, 24 Oct 2017 20:51:44 +0000 (20:51 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
aa8a972ea3 am:
2ef76cb0d2
am:
17a1b4e1fc
Change-Id: Ia8ad6a2475329fca2431ef99a9b890c8ec5502e5
Fan Zhang [Tue, 24 Oct 2017 20:50:40 +0000 (20:50 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings" am:
2bcbc35b29 am:
e373209b97
am:
614f7aafdc
Change-Id: Iafee32f071387ac36faa42cc9e3812109f769a8b
Bill Yi [Tue, 24 Oct 2017 20:42:12 +0000 (20:42 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
aa8a972ea3
am:
2ef76cb0d2
Change-Id: I906612380c00db46a4d71e8aeceb822af857f744
Fan Zhang [Tue, 24 Oct 2017 20:41:16 +0000 (20:41 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings" am:
2bcbc35b29
am:
e373209b97
Change-Id: I67452d72f814fc0a1f11fd7699a1134f03a00a6f
Bill Yi [Tue, 24 Oct 2017 20:33:44 +0000 (20:33 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
aa8a972ea3
Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93
Fan Zhang [Tue, 24 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
am:
2bcbc35b29
Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6
Bill Yi [Tue, 24 Oct 2017 20:05:39 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am:
66ecad49ba -s ours
am:
18fea4f0c3 -s ours
Change-Id: I186526954502d5b71e4d847e3d6614486bdd8da0
Bill Yi [Tue, 24 Oct 2017 20:03:09 +0000 (20:03 +0000)]
Import translations. DO NOT MERGE
am:
66ecad49ba -s ours
Change-Id: I46bc589e7ad984e910b5ebfc118614d0d1b0bee0
TreeHugger Robot [Tue, 24 Oct 2017 18:42:03 +0000 (18:42 +0000)]
Merge "Deprecate resId field in SearchIndexableResources"
Bill Yi [Tue, 24 Oct 2017 18:32:26 +0000 (11:32 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Fan Zhang [Tue, 24 Oct 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
Fan Zhang [Mon, 23 Oct 2017 22:21:09 +0000 (15:21 -0700)]
Deprecate resId field in SearchIndexableResources
Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd
Bug:
37741509
Test: robotests
Jeffrey Huang [Tue, 24 Oct 2017 16:52:12 +0000 (16:52 +0000)]
Merge "Reduce padding so that view is no longer hidden"
tiansiming [Tue, 24 Oct 2017 09:19:27 +0000 (17:19 +0800)]
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>
Rajeev Kumar [Tue, 24 Oct 2017 05:35:35 +0000 (22:35 -0700)]
resolve merge conflicts of
ac0fd76521 to master
Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.
Rajeev Kumar [Tue, 24 Oct 2017 05:01:49 +0000 (05:01 +0000)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
am:
dd8e66fa20
Change-Id: I0b27a9c68a17f87876d477bad0d10b270aecd550
Rajeev Kumar [Fri, 20 Oct 2017 19:44:17 +0000 (12:44 -0700)]
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
Fan Zhang [Tue, 24 Oct 2017 00:29:14 +0000 (00:29 +0000)]
Add strings to support multi-state vivid color management am:
e1543a3895
am:
bb6efe3743
Change-Id: Ie33e65251265406cfb80d4a46e0fff4c6915d161
TreeHugger Robot [Tue, 24 Oct 2017 00:27:55 +0000 (00:27 +0000)]
Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib"
Fan Zhang [Tue, 24 Oct 2017 00:27:02 +0000 (00:27 +0000)]
Add strings to support multi-state vivid color management
am:
e1543a3895
Change-Id: Icc99c1e3348425d70fea3235a4d4c63385c3d38f
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
TreeHugger Robot [Mon, 23 Oct 2017 23:15:02 +0000 (23:15 +0000)]
Merge "Deprecate Icons from SearchIndexableResources"
Daniel Finchelstein [Mon, 23 Oct 2017 22:54:06 +0000 (22:54 +0000)]
Merge "Revert "Revert "Settings: Enable HAL HDR+ by default"""
Tony Mantler [Fri, 20 Oct 2017 22:03:28 +0000 (15:03 -0700)]
Move SimStatus and ImeiInfo Pref Controllers to SettingsLib
Bug:
67410808
Test: RunSettingsRoboTests
Change-Id: Ib55d2365814b5882f7fcae6bb7f1b62cc3d6ad4e
Fan Zhang [Mon, 23 Oct 2017 21:11:34 +0000 (14:11 -0700)]
Deprecate Icons from SearchIndexableResources
Change-Id: Ic1b9fa1cf5c7ab171b645565a9db5db1993ac85f
Fixes:
38027997
Test: robotests
Doris Ling [Mon, 23 Oct 2017 21:05:45 +0000 (14:05 -0700)]
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
Chien-Yu Chen [Tue, 10 Oct 2017 18:36:57 +0000 (11:36 -0700)]
Revert "Revert "Settings: Enable HAL HDR+ by default""
This reverts commit
781e762c2c68027c6b4bf8bcb71979c5e8c595c3.
Also updated the V2 version, which was not in the original revert CL.
Test: CTS
Bug:
67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
TreeHugger Robot [Sat, 21 Oct 2017 00:07:39 +0000 (00:07 +0000)]
Merge "Set activity title from preference screen title."
TreeHugger Robot [Fri, 20 Oct 2017 23:22:40 +0000 (23:22 +0000)]
Merge "Adding new methods to FakeUid."
TreeHugger Robot [Fri, 20 Oct 2017 23:00:42 +0000 (23:00 +0000)]
Merge "Fix crash from Settings Search"
Doris Ling [Fri, 20 Oct 2017 22:29:56 +0000 (15:29 -0700)]
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
TreeHugger Robot [Fri, 20 Oct 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Add FingerprintEnroll API"
Jack Yu [Fri, 20 Oct 2017 20:06:05 +0000 (20:06 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c am:
3966912efa am:
d4ef8eca27
am:
71beadce17
Change-Id: I8fe1a2170c1e93e898959cbd932596b90ba10bb5
jeffreyhuang [Fri, 20 Oct 2017 20:00:36 +0000 (13:00 -0700)]
Reduce padding so that view is no longer hidden
Change-Id: Iaf9bdea162a8c7422914c141625885873fe1b878
Fixes:
63583041
Test: Manual using settings app
Jack Yu [Fri, 20 Oct 2017 19:52:40 +0000 (19:52 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c am:
3966912efa
am:
d4ef8eca27
Change-Id: I969c83a120ab14b5b3aed1c8ef26c9b1970b510d
Jack Yu [Fri, 20 Oct 2017 19:41:05 +0000 (19:41 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c
am:
3966912efa
Change-Id: Id337bec84de9d6725974cca94945ba20ebe0e63d
Jack Yu [Fri, 20 Oct 2017 19:30:29 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am:
60d6ffbc6c
Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"
TreeHugger Robot [Fri, 20 Oct 2017 17:55:37 +0000 (17:55 +0000)]
Merge "Switch the buttons in bt detail page"
Bill Yi [Fri, 20 Oct 2017 17:45:29 +0000 (17:45 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a5d652c89f -s ours am:
8313368b32 -s ours
am:
7a20f4a206 -s ours
Change-Id: Iaacf56caee3d21c12d4278b08e543e3a6fb03ead
Bill Yi [Fri, 20 Oct 2017 17:15:14 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a5d652c89f -s ours
am:
8313368b32 -s ours
Change-Id: Id8ca07902a1ec999a3924f4f77d1318da68a6cef
TreeHugger Robot [Fri, 20 Oct 2017 16:55:37 +0000 (16:55 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
Bill Yi [Fri, 20 Oct 2017 16:47:03 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
a5d652c89f -s ours
Change-Id: I10da6389cb21f6c4ddcc4b6047feed58c48bd665
OSDN Git Service
