Commit Graph

13249 Commits

Author SHA1 Message Date
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
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
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
Doris Ling
4930065f3a Update tile limit for Sound settings. am: 893bdba206
am: 15d06244d3

Change-Id: Ib307fc04adea4b7371f5234fa0c5c0813ff7b41e
2017-10-15 05:33:47 +00:00
Doris Ling
15d06244d3 Update tile limit for Sound settings.
am: 893bdba206

Change-Id: Ie73472f54d737ae8058ff95a65d16068750ace24
2017-10-15 02:43:43 +00:00
TreeHugger Robot
aad3b1cef2 Merge "Use ButtonBarLayout to stack buttons" 2017-10-13 20:12:49 +00:00
TreeHugger Robot
909df8b966 Merge "There is no NEXT button in find sensor screen of fingerprint." 2017-10-13 20:11:09 +00:00
Doris Ling
893bdba206 Update tile limit for Sound settings.
Pull the notification and alarm ringtone out of the preference category
and update the tile limit to 1, so that only the first preference
category will be displayed initially.

Change-Id: I9ae7669fb2b688560a3fc228274ea44f225b262f
Fixes: 67750626
Test: visual
2017-10-13 11:45:30 -07:00
Maurice Lam
bb31c01f87 Use ButtonBarLayout to stack buttons
In fingerprint-enroll-finish landscape, if there is not enough space
to display the buttons, stack them by using ButtonBarLayout.

Bug: 67370165
Test: Manual
Change-Id: I482b811d6a2af545c4783a1cdd50b566c34b60c3
2017-10-13 01:21:31 +00:00
TreeHugger Robot
bda0d166bb Merge "Move ManageApplications to sub package and remove dead code" 2017-10-12 22:46:43 +00:00
Fan Zhang
a8cac7a409 Move ManageApplications to sub package and remove dead code
Bug: 64804294
Test: rerun test
Change-Id: I23cbd8da9b65f52470030ba3b9b676ece2bada11
2017-10-12 13:48:54 -07:00
Beverly Tai
f424c3fa90 Merge "Replaced dnd priority setting page w/ behavior." 2017-10-12 13:20:41 +00:00
Beverly
ad898e6928 Replaced dnd priority setting page w/ behavior.
Bug: 63077372
Test: manual, make -j20 RunSettingsRoboTests
Change-Id: I79fd431da0cbed1407f0dab38e64f0bdb3ff3feb
2017-10-11 17:55:00 -04:00
TreeHugger Robot
3f4a7922f4 Merge "Import translations. DO NOT MERGE" 2017-10-11 21:31:08 +00:00
Bill Yi
5fdc38e696 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I3b96a50ff43d0d3611d3a59d12c265ca3fff5712
2017-10-11 11:28:21 -07:00
Bill Yi
9673578d9f Import translations. DO NOT MERGE
Change-Id: Ia75e445137d69499ce2094190772ee2bf1365afe
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-10-11 11:14:56 -07:00
TreeHugger Robot
311c981cb0 Merge "Update suggestion (with button) card's title textAppearance" 2017-10-11 02:59:31 +00:00
Fan Zhang
da2fadf607 Update suggestion (with button) card's title textAppearance
Bug: 65065268
Test: visual
Change-Id: I41c7494b935b6465fc99a5fe5dec3d501364f017
2017-10-10 18:17:28 -07:00
TreeHugger Robot
921db1f98c Merge "Remove DevelopmentTileConfigActivity and clean up fragment." 2017-10-10 23:38:36 +00:00
TreeHugger Robot
be1220071b Merge "Add content description to suggesiton footer" 2017-10-10 22:17:01 +00:00
TreeHugger Robot
0f3bb0447f Merge "Convert more of StatusFragment to PreferenceControllers" 2017-10-10 21:04:21 +00:00
Fan Zhang
e84911dcf9 Add content description to suggesiton footer
Change-Id: I90402301f9a294326619d8e353e14c1db9962b86
Fixes: 67633955
Test: manual
2017-10-10 12:59:08 -07:00
Fan Zhang
8333260aa5 Remove DevelopmentTileConfigActivity and clean up fragment.
- The tile activity is internal to Settings and nobody should launch it
  externally, thus it doesn't need to have its own activity. Preference
  framework can launch the fragment as a SubSetting

Fixes: 67603649
Test: robotests
Change-Id: I9ba2fc55eb7f571f816ec045567f2dd2714c44e8
2017-10-10 12:12:19 -07:00
TreeHugger Robot
d2b2d2ae0f Merge "Alphabetically sort special access setting menus." 2017-10-10 18:48:48 +00:00
edgar.huang
bd0d33e3bd There is no NEXT button in find sensor screen of fingerprint.
Precondition: set the Font size and Display size to largest
Enter into the find sensor screen and the NEXT button is missing.
Test: manual - Enter into the find sensor screen -
and can find the NEXT button after sliding the screen.

Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I8f6219ab22abad98111f016d633bf100dc3222ce
2017-10-10 01:51:33 +00:00
TreeHugger Robot
68468aa892 Merge "Add left padding to misc pages" 2017-10-10 00:06:14 +00:00
TreeHugger Robot
67430754f0 Merge "Move summary_empty string to settingslib" 2017-10-09 23:34:59 +00:00
Kevin Chyn
0f0ae3426e Merge "Fingerprint enrolling icon should not overlap text" 2017-10-09 22:25:29 +00:00
Fan Zhang
4bc914386b Alphabetically sort special access setting menus.
Change-Id: I8e2a0a37995438edf12367dd27b6d7a65fb704c7
Fixes: 36077121
Test: visual
2017-10-09 15:18:15 -07:00
Fan Zhang
a0450c78eb Add left padding to misc pages
Change-Id: I6349672e92d170564212679d58cdbfe9991005a2
Fixes: 36459450
Test: visual
2017-10-09 15:11:42 -07:00
Fan Zhang
52e39240e8 Move summary_empty string to settingslib
Bug: 65612375
Test: rebuild
Change-Id: Ib55e66c02267b9419e92885973e0d9e3287959b7
2017-10-09 13:53:45 -07:00