Commit Graph

20074 Commits

Author SHA1 Message Date
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
Treehugger Robot
c8207de343 Merge "Add a developer option for controlling DNS over TLS" 2017-10-20 14:58:39 +00:00
Jack Yu
2f010230df Refactored area update info support
1. Refactored area update information support so it
   is not limited to channel 50 and Brazil.
2. Added channel 60 for India.

Test: Manual
bug: 37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit c3cab8ecb8)
2017-10-19 17:36:33 -07:00
jeffreyhuang
f6d360ebb5 Update DeviceModelPreferenceController
- Added serial number to the dialog for about phone v2
 - prefixed model to the preference summary for about phone v2

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ic2950adcecf940ad8c9256688dc70b662ad5f0d6
2017-10-19 16:50:45 -07:00
Fan Zhang
1389a0c9c9 Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes: 68013053
Test: robotests
2017-10-19 16:49:21 -07:00
jackqdyulei
d3ffdc564c Switch the buttons in bt detail page
The forget button should be left and connect button be right.

Bug: 67915643
Test: RunSettingsRoboTests
Change-Id: I71bb99270c4a3d480346db1ded554ecc9b99e706
2017-10-19 16:48:28 -07:00
TreeHugger Robot
7544e115a7 Merge "Misc logging improvements" 2017-10-19 23:18:17 +00:00
jeffreyhuang
931681a633 Add existing controllers in about phone to v2 fork
- Added build number controller
 - Added safety info controller
 - Added regulatory info controller

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Icddb9d352b4f739ca1c7cf562dec09530cb41dac
2017-10-19 15:08:43 -07:00
TreeHugger Robot
a431360dfe Merge "Fingerprint enrolling should update UI while in multi-window mode" 2017-10-19 21:47:21 +00:00
jeffreyhuang
d81622e790 Fork a new about phone layout
- Used a feature flag to hide the new about phone page

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ie7b6afa58b301128d1c60513ae4ee48d6ec6679b
2017-10-19 14:18:26 -07:00
tiansiming
6744588fd8 Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43 am: ecf2bdb46f
am: cca755cfac

Change-Id: Ibe3700977ed96afe09e0b15ceecf125edeb6d23b
2017-10-19 19:29:11 +00:00
tiansiming
cca755cfac Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43
am: ecf2bdb46f

Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
2017-10-19 19:24:53 +00:00
tiansiming
ecf2bdb46f Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
am: 92e77cbd43

Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031
2017-10-19 19:22:16 +00:00
tiansiming
92e77cbd43 Merge "Fix wrong position of cursor in IccLockSettings"
am: 3a3044eeef

Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
2017-10-19 19:20:09 +00:00
Matthew Fritze
9c3c7d8ccd Fix crash from Settings Search
Security Settings was returning a search indexable
resource without an xml resource (in this case id = 0).

Settings search did not handle this exception and crashed.
This patch catches the exception, and adds a TODO to fix
the indexing in security settings.

Change-Id: Ic7f05c98d99cc45fbebbdc672c7e346c27daa0f0
Fixes: 67967367
Test: robotests
2017-10-19 10:58:05 -07:00