Commit Graph

13636 Commits

Author SHA1 Message Date
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
TreeHugger Robot
2bb74379e5 Merge "Update preference screen title." 2017-10-25 20:30:31 +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
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
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
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
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
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
Jeffrey Huang
f253f0e10d Merge "Reduce padding so that view is no longer hidden" 2017-10-24 16:52:12 +00: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
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
jeffreyhuang
774b6b7573 Reduce padding so that view is no longer hidden
Change-Id: Iaf9bdea162a8c7422914c141625885873fe1b878
Fixes: 63583041
Test: Manual using settings app
2017-10-20 13:00:36 -07: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
TreeHugger Robot
a5d652c89f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:28:33 +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
Bill Yi
074e2ee9ba Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
2017-10-20 03:21:50 -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
jeffreyhuang
e5fc1fbd2c Create XML layout for about phone v2
- Added all the necessary preferences in the xml layout

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I36f76f9360b809eba077497db68d012098820868
2017-10-19 15:08:43 -07: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
Bill Yi
69d44faa12 Import translations. DO NOT MERGE
Change-Id: I077bf16890d37404acb52c6ee1fdf584a978e094
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-10-18 18:17:06 -07:00
Maurice Lam
ac8024ef44 Update confirm button label
Test: Existing tests pass
Bug: 65123475
Change-Id: Ib730507db54fe2bab881fa040ead737c6736ee1a
2017-10-18 16:16:35 -07:00
Malcolm Chen
d089db8d6e Revert "Delete unused classes"
This reverts commit 2fa45c92e6.
It bring back SlidingTabLayout.java which will be used for
multi-SIM configurations.

Bug: 65648147
Test: unittest
Change-Id: I84c75a2e1d33fc89f58165c662d82a8ad3d6ef20
2017-10-18 16:08:41 -07:00
TreeHugger Robot
528f3bfeec Merge "Adjusting char limits in zen mode settings." 2017-10-18 15:53:59 +00:00
Beverly
adb0fb00a2 Adjusting char limits in zen mode settings.
Test: manual
Change-Id: I9fd1f2bcb01f83b464877a3f3c7de3e28249126e
Fixes: 67871480
2017-10-18 09:50:40 -04:00
TreeHugger Robot
b73a67c7a0 Merge "Switch to recyclerview in ManageApplications" 2017-10-18 02:20:06 +00:00
Fan Zhang
78369d91bc Switch to recyclerview in ManageApplications
- Replace ListView with RecyclerView in layout
- Replace ApplicationAdapter's superclass to be RecyclerView.Adapter
- Change adapter interfaces (where necessary) to work with RecyclerView
- Replace fast scroll with Recycler's mechanism (all in xml)
- Removed section indexer (text bubble when fast scroll) because
  recyclerview doesn't support it.

Bug: 64804294
Test: robotests
Change-Id: I55b221836ce6abdeddf4568c8a8a5632cbddbd3b
2017-10-17 17:41:44 -07:00
TreeHugger Robot
47775667b8 Merge "Add work-only-category controller" 2017-10-17 19:10:29 +00:00
Fan Zhang
1bde0d84b0 Add work-only-category controller
The controller will hide category if there is no child in it.

Change-Id: I9bbcc4115b991574e608933f98857b0b4eb2ed7d
Fixes: 62185871
Test: robotests
2017-10-17 10:34:36 -07:00
TreeHugger Robot
ec234edcc1 Merge "Adjusted char limits and media/system string." 2017-10-17 16:04:20 +00:00
Beverly
052ac3d84e Adjusted char limits and media/system string.
Change-Id: Iad4d9980fc52970d1ee8221053dd116c5bbcd9cb
Fixes: 67821000
Fixes: 67827886
Fixes: 67820998
Test: manual
2017-10-17 09:45:56 -04:00
TreeHugger Robot
ffa3095aca Merge "Add advanced button to security & location page" 2017-10-17 02:09:45 +00:00
Fan Zhang
069830012f Add advanced button to security & location page
Change-Id: I45977105d6ddabef8f2d9bdc7b46959af9cbbf0f
Fixes: 36657221
Test: visual
2017-10-16 17:39:27 -07:00
Maurice Lam
c03cf0092e resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302
am: 0e1c486e74

Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e
2017-10-16 19:25:57 +00:00
Maurice Lam
d4621f6302 resolve merge conflicts of f36b25c2df to stage-aosp-master
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
2017-10-16 18:31:40 +00:00