Commit Graph

5657 Commits

Author SHA1 Message Date
Lei Yu
10280a53b0 Merge "Fix the bug using wrong TimeUnit" into pi-dev 2018-04-23 16:59:47 +00:00
Pavel Grafov
2548326afc Merge "Pick default notification setting for work profile" into pi-dev am: bb839f81e3
am: 0bdd7cf4f2

Change-Id: Id9c0d04e816f891df7e180974af104edac04905e
2018-04-23 09:51:49 -07:00
TreeHugger Robot
bb839f81e3 Merge "Pick default notification setting for work profile" into pi-dev 2018-04-23 16:38:43 +00:00
Matthew Fritze
04926f35b7 Merge "Add keywords to Slices" into pi-dev am: 2f911e2e9e
am: 21521826d9

Change-Id: I38d9efabcdecf3c40f1af28ecd167e58c2586ca7
2018-04-20 20:27:02 -07:00
TreeHugger Robot
524babb389 Merge "Catch exception when failing to create slice" into pi-dev 2018-04-21 02:03:49 +00:00
Salvador Martinez
fbdc2f2e5e resolve merge conflicts of 42d0815115 to master
Change-Id: I949e09de6aade8d07857a2b8d4bd34a549795939

Bug: None
Test: I solemnly swear I tested this conflict resolution
2018-04-20 18:10:13 -07:00
Fan Zhang
0e5a3273af Catch exception when failing to create slice
- Created a non-generic exception type when failing SliceData.build()
- Catch exception and log error instead of crash.
- Added a presubmit test

Fixes: 78347031
Test: robotests, atest
Change-Id: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
Merged-In: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
2018-04-20 23:55:39 +00:00
Lei Yu
4c94926ba5 Fix the bug using wrong TimeUnit
It should use DAYS, not HOURS.

Change-Id: I26784822c86e58cad93d35b6772ea54af7efb8f5
Fixes: 78362305
Test: RunSettingsRoboTests
2018-04-20 16:45:02 -07:00
TreeHugger Robot
2f911e2e9e Merge "Add keywords to Slices" into pi-dev 2018-04-20 23:30:18 +00:00
Salvador Martinez
681353f725 Merge "Update settings main page battery string" into pi-dev 2018-04-20 23:27:25 +00:00
Fan Zhang
2a7fcc4d6f Catch exception when failing to create slice
- Created a non-generic exception type when failing SliceData.build()
- Catch exception and log error instead of crash.
- Added a presubmit test

Fixes: 78347031
Test: robotests, atest
Change-Id: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
2018-04-20 15:46:35 -07:00
Matthew Fritze
47a44e8fa4 Add keywords to Slices
Attach the keywords used for Settings search to Slices.
Their primary use is helping match synonyms for presenters
which display slices without explicit Uri requests, like a launcher.

This changes:
- Updates database scheme
- Adds to SliceData object
- Grab keywords in the SliceDataConverter
- Set keywords on all slices

Test: robotests
Change-Id: I16c40d2380ffddaf0a87fb1b9cd58e95573b308f
Fixes: 78306195
2018-04-20 14:50:55 -07:00
Lei Yu
252d4e1fc0 Fix bugs in auto restriction.
1. Dismiss this tip once user clicks it and goes to detail page.
2. In auto restriction, since apps are automatically restricted,
we need to remove apps in list that unrestricted by user.
3. Refactor the code to remove the unnecessary parameter(i.e.
SettingsActivity)

Bug: 78187414
Test: RunSettingsRoboTests
Change-Id: I1c950f7c55df35795641c2ea8579ce9e011dba28
2018-04-20 12:55:53 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Pavel Grafov
c29b984a98 Pick default notification setting for work profile
Managed profiles cannot completely hide notifications, so
this setting should be treated as always "true" for them.

Change-Id: I9808c1e9736d83efccb0e947d9097379bda59ebb
Fixes: 78194020
Test: atest RedactionInterstitialTest
2018-04-20 16:29:37 +01:00
Matthew Fritze
13365e83c0 Merge "Update Slice APIs to current versions" into pi-dev am: ff2653a0d8
am: a69121d654

Change-Id: I6ca82c2b9b83c6cbb623548eee3aa910b4c59687
2018-04-19 20:33:41 -07:00
Salvador Martinez
07c11d36e2 Merge "Make WifiTether listen to datasaver" into pi-dev am: 96d4cd3c61
am: 0724373e16

Change-Id: I01ab69908965f87df71130955a4f4fdc47b4239c
2018-04-19 20:20:39 -07:00
TreeHugger Robot
ff2653a0d8 Merge "Update Slice APIs to current versions" into pi-dev 2018-04-20 03:11:14 +00:00
TreeHugger Robot
96d4cd3c61 Merge "Make WifiTether listen to datasaver" into pi-dev 2018-04-20 02:57:04 +00:00
Salvador Martinez
7ba65c39ae Make WifiTether listen to datasaver
Wifi Tethering is already turned off when appropriate. However
if you re-enable it you still can't toggle the tether switchbar.
This CL makes it so that if you disable data saver the toggle
becomes enabled again.

Test: robotests
Bug: 77860936
Change-Id: I03fa74c21674678a90cde7bd20fa68167f02ae3c
2018-04-20 02:56:47 +00:00
Salvador Martinez
adebfe35a9 Merge "Update Wifi Tether band selection UI" into pi-dev am: d9abb0e914
am: bef9e8516d

Change-Id: I088a291c8d936c6e321883d9a35746b42db1df3b
2018-04-19 18:13:58 -07:00
Fan Zhang
e537da877b Merge "Format number to local locale." into pi-dev am: 0468f68c02
am: 92c62ba2eb

Change-Id: I3a0f1322e3f904c90f1e616be454ba710f094781
2018-04-19 18:13:21 -07:00
Matthew Fritze
f9f72e8c2c Update Slice APIs to current versions
Change-Id: Icf40673e518534487be77f33427df937717735e5
Fixes: 77982356
Test: robotests
2018-04-19 17:29:18 -07:00
TreeHugger Robot
2bc391bb09 Merge "Remove LockdownButtonPreferenceController from java" 2018-04-20 00:16:43 +00:00
TreeHugger Robot
d9abb0e914 Merge "Update Wifi Tether band selection UI" into pi-dev 2018-04-20 00:15:45 +00:00
Fan Zhang
0468f68c02 Merge "Format number to local locale." into pi-dev 2018-04-20 00:01:01 +00:00
Fan Zhang
040df90c50 Format number to local locale.
Change-Id: Iffa91eb8c40f09e5ac4cce10f355e348e62d8fce
Fixes: 78134172
Test: robotests
2018-04-19 15:54:39 -07:00
TreeHugger Robot
f9a768d6c3 Merge "Migrate LegalSettings to DashboardFragment" 2018-04-19 22:36:09 +00:00
Fan Zhang
e136bb550e Remove LockdownButtonPreferenceController from java
It's already registered in xml.

Change-Id: I9b363e0d7543fd8139b4e4e65e11d567cbf2ae70
Fixes: 78299993
Test: robotests
2018-04-19 22:13:42 +00:00
Yanting_Yang
42513afac0 Migrate LegalSettings to DashboardFragment
- CopyrightPreferenceController
- LegalPreferenceController
- LicensePreferenceController
- TermsPreferenceController
- WallpaperAttributionsPreferenceController
- WebViewLicensePreferenceController

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
      make RunSettingsRoboTests -j ROBOTEST_FILTER=CodeInspectionTest
      atest UniquePreferenceTest

Change-Id: I28108eb926f9efec63390c2354cb0ebc0a785ec2
2018-04-19 14:42:00 -07:00
rafftsai
c43f9f594f Change base fragment to InstrumentedFragment
- Modify PrivateVolumeForget, PrivateVolumeFormat, PrivateVolumeUnmount
- Add ShadowStorageManager
- Add test cases

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo

Change-Id: I6883dd12cec00abbc3099bf31d285e6fe455eba6
2018-04-19 21:27:13 +00:00
Salvador Martinez
10ba9c1786 Update Wifi Tether band selection UI
This CL updates the preference for selecting the enabled tether bands
to allow individual selection of multiple bands instead of forcing
a single selection. Note that while this makes the UI theoretically
support new bands in the future, the wifi backend only supports
selecting a single band or all bands which this CL does not address.

Test: robotests
Bug: 73102003
Change-Id: Ib2d4a2834c5cd11875515d308f7b20bfc8471959
2018-04-19 13:37:09 -07:00
Salvador Martinez
9d03322d2c Merge "Fix restricted fragment dialogs" into pi-dev am: dbe38b09cf
am: c1b16f62ad

Change-Id: I32ec3d32e067f03f63335292c7541253bfe372ff
2018-04-19 13:25:14 -07:00
Salvador Martinez
dbe38b09cf Merge "Fix restricted fragment dialogs" into pi-dev 2018-04-19 20:09:08 +00:00
Lei Yu
646698c7ab Merge "update checkbox based on FAS API" into pi-dev am: cff99cc2e3
am: bbf793460b

Change-Id: I7709702e12d28e7403e134c9da65d8735e54dcf6
2018-04-19 10:47:22 -07:00
Beverly Tai
83cbcbb72a Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
am: ee3164bd42

Change-Id: I63a71e144fd3b93c2c9b285cd637ba656092fa79
2018-04-19 10:30:43 -07:00
Lei Yu
cff99cc2e3 Merge "update checkbox based on FAS API" into pi-dev 2018-04-19 17:01:23 +00:00
Beverly Tai
48831c837f Merge "Can disable checkbox without tint on text" into pi-dev 2018-04-19 16:57:05 +00:00
Jeff Chang
224d2c2e6a Merge "The Google specific bits should not in AOSP tests." 2018-04-19 16:42:03 +00:00
Beverly
49f7f8137f Can disable checkbox without tint on text
Fixes: 76101594
Test: DisabledCheckBoxPreferenceTest, ZenModeVisEffectPreferenceControllerTest
Change-Id: Ida92c7d94f788404d9cd48f07e779446d9ac0d54
2018-04-19 09:27:22 -04:00
Ivan Chiang
f2f03b8198 Add DockUpdaterFeatureProvider and DockUpdater.
Add the new feature components for dock devices.

Bug: 77931823
Test: Build
Change-Id: I219a5256d02f2b1b8ea7cce1cff4219975f2eae2
2018-04-19 16:04:08 +08:00
TreeHugger Robot
f89e9e4174 Merge "Modified the PrivacySettings and add PreferenceControllers" 2018-04-19 02:39:28 +00:00
Salvador Martinez
950d94f689 Update settings main page battery string
UX requested that the percentage be moved to the front.

Test: robotests pass
Bug: 77874406
Change-Id: I7008c81fa42487bb71ecd84b6a66203d89fe50a8
2018-04-18 18:26:36 -07:00
Salvador Martinez
8c975b7bc0 Fix restricted fragment dialogs
The dialog for a setting being restricted was showing even when the
password was being entered correctly. This CL makes it so that
if the password is correctly entered we dismiss the dialog if it
is up.

Test: robotests
Bug: 77722622
Change-Id: Ifc82bc1e5800afff2a0883a13bf316f84169d80d
2018-04-18 18:04:13 -07:00
sunnyshao
15ec2cf8ef Modified the PrivacySettings and add PreferenceControllers
- Changed the PrivacySettings to DashboardFragment.
- Added the new five related PreferenceControllers and related codes
- Modified the privacy_settings.xml
- Removed the PrivacySettingsTest test by design changed
- Moved the PrivacySettings.java from root directory to backup

Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ic88e2e58a11d024d2394f75c3db5b46fe2d86dba
2018-04-18 18:02:53 -07:00
Fan Zhang
4db6aac464 Use ListFormatter to join strings for network dashboard
Test: robotests
Change-Id: Ie15512acb35c185f9a59bf268303b7993cc40947
2018-04-19 00:40:53 +00:00
Jan Nordqvist
d19398abae Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev am: 27441a984a
am: 6bc28cdb51

Change-Id: If762696a406b96cb4cdc8a30bcd1b8d70db2804b
2018-04-18 17:26:52 -07:00
TreeHugger Robot
27441a984a Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev 2018-04-18 23:49:31 +00:00
Lei Yu
cbb6836e68 Merge "Force update all suggestions but app restriction" into pi-dev am: 68ef601059
am: 5f3bacea9c

Change-Id: I1b68483b257b81f723e46badb18a94b1b7335f8c
2018-04-18 12:49:47 -07:00
Julia Reynolds
8aa8f34b36 Expand channel settings if coming from app am: f3290eafce
am: 520fde650d

Change-Id: I056fa1ed816ec1ef0b898ab18471f5dfe6c9613f
2018-04-18 12:31:19 -07:00