OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoFix NPE during unit test
Fan Zhang [Mon, 30 Apr 2018 20:41:56 +0000 (13:41 -0700)]
Fix NPE during unit test

As of ag/3932176 the slice indexer now queries getSummary() for each
controller. So we need to create all necessary objects before
getSummary(). In this case, the PSCD object.

Change-Id: I0162996be37d740f1e450880bf4698acd94ca0ad
Fixes: 78897071
Test: atest

6 years agoMerge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev am: 820a26c6bd
Ivan Chiang [Wed, 25 Apr 2018 19:43:01 +0000 (12:43 -0700)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev am: 820a26c6bd
am: e7f3afba9d

Change-Id: I0b1e8dd9f23b2077051341a991f309ace42cbb34

6 years agoMerge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
Ivan Chiang [Wed, 25 Apr 2018 19:36:25 +0000 (12:36 -0700)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
am: 820a26c6bd

Change-Id: Ie77ac8eb096ebfa37445233481ad31d9511c1b7e

6 years agoMerge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 19:21:56 +0000 (19:21 +0000)]
Merge "Add DockUpdaterFeatureProvider and DockUpdater." into pi-dev

6 years agoMerge "Make Nfc/Beam searchable based on feature availability" into pi-dev am: dc09b3ff49
hjchangliao [Wed, 25 Apr 2018 17:23:11 +0000 (10:23 -0700)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev am: dc09b3ff49
am: f549cd1e05

Change-Id: Ied4f01787aec0cf8f261483e942615abd1889918

6 years agoMerge "Fixes crash in security settings." into pi-dev am: abe44c2674
Doris Ling [Wed, 25 Apr 2018 17:22:36 +0000 (10:22 -0700)]
Merge "Fixes crash in security settings." into pi-dev am: abe44c2674
am: c7494be56e

Change-Id: I06db8956a4cb67aa650b7b32dab1c83130d7a97a

6 years agoMerge "Make Nfc/Beam searchable based on feature availability" into pi-dev
hjchangliao [Wed, 25 Apr 2018 17:16:41 +0000 (10:16 -0700)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev
am: dc09b3ff49

Change-Id: I3574ef8d49987b0b94bb2641d15cbf782772e5f7

6 years agoMerge "Fixes crash in security settings." into pi-dev
Doris Ling [Wed, 25 Apr 2018 17:16:05 +0000 (10:16 -0700)]
Merge "Fixes crash in security settings." into pi-dev
am: abe44c2674

Change-Id: I6d0730a148fbfecaaa4b94e376550af613ad174b

6 years agoMerge "Make Nfc/Beam searchable based on feature availability" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 17:13:48 +0000 (17:13 +0000)]
Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev

6 years agoMake Nfc/Beam searchable based on feature availability
hjchangliao [Wed, 25 Apr 2018 03:38:05 +0000 (11:38 +0800)]
Make Nfc/Beam searchable based on feature availability

Update logic of updateNonIndexableKeys,
in BaseNfcPreferenceController to fix issue.
Add robotest to avoid same problem.

Change-Id: I1de5324b5a7147ff58e3c366ee7e8cf858e3283c
Fixes: 78540155
Test: make RunSettingsRoboTests

6 years agoMerge "Fixes crash in security settings." into pi-dev
Doris Ling [Wed, 25 Apr 2018 17:05:18 +0000 (17:05 +0000)]
Merge "Fixes crash in security settings." into pi-dev

6 years agoMerge "Update brightness percentage display logic to match sysui." into pi-dev am...
Fan Zhang [Wed, 25 Apr 2018 15:25:54 +0000 (08:25 -0700)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev am: 69d12406f0
am: e9045a7a41

Change-Id: I20c27b31caa7a44b6d114780a0b7b18206f75d12

6 years agoMerge "Update brightness percentage display logic to match sysui." into pi-dev
Fan Zhang [Wed, 25 Apr 2018 15:14:28 +0000 (08:14 -0700)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev
am: 69d12406f0

Change-Id: I9e209e042b129f9c1e92878c11ec6affa4e40ccb

6 years agoMerge "Update brightness percentage display logic to match sysui." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 15:07:32 +0000 (15:07 +0000)]
Merge "Update brightness percentage display logic to match sysui." into pi-dev

6 years agoMerge "Hide the audio switcher if it is not relevant" into pi-dev am: 3f5444b9e4
caxtonchan [Wed, 25 Apr 2018 04:04:45 +0000 (21:04 -0700)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev am: 3f5444b9e4
am: 67d44d9d61

Change-Id: I36b249159ef8d0a6d099ba776c5d682ea596e5e3

6 years agoMerge "Hide the audio switcher if it is not relevant" into pi-dev
caxtonchan [Wed, 25 Apr 2018 03:54:43 +0000 (20:54 -0700)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev
am: 3f5444b9e4

Change-Id: Ie376aafe5ebfff928e5011ac772f5faaeb494c0d

6 years agoMerge "Hide the audio switcher if it is not relevant" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 03:42:17 +0000 (03:42 +0000)]
Merge "Hide the audio switcher if it is not relevant" into pi-dev

6 years agoMerge "Check if boxes still available when restoring state" into pi-dev am: 6fcce25b72
Salvador Martinez [Wed, 25 Apr 2018 02:13:32 +0000 (19:13 -0700)]
Merge "Check if boxes still available when restoring state" into pi-dev am: 6fcce25b72
am: f6d5f31564

Change-Id: I8b59411b62292b8f65a62f60bde8981c66f3401a

6 years agoMerge "Check if boxes still available when restoring state" into pi-dev
Salvador Martinez [Wed, 25 Apr 2018 02:08:51 +0000 (19:08 -0700)]
Merge "Check if boxes still available when restoring state" into pi-dev
am: 6fcce25b72

Change-Id: Ia85fbd3b5068f739254fae45403fdf2f4b45f595

6 years agoMerge "Check if boxes still available when restoring state" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 02:00:48 +0000 (02:00 +0000)]
Merge "Check if boxes still available when restoring state" into pi-dev

6 years agoMerge "Fix a incorrect class cast in GameControllerPreferenceCtrl"
TreeHugger Robot [Wed, 25 Apr 2018 01:36:51 +0000 (01:36 +0000)]
Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl"

6 years agoHide the audio switcher if it is not relevant
caxtonchan [Mon, 23 Apr 2018 07:04:21 +0000 (15:04 +0800)]
Hide the audio switcher if it is not relevant

Bug: 78317337
Test: make RunSettingsRoboTests
ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28

Change-Id: I9824941cf410b26ad166aa163d7cccd3bfc31a06

6 years agoFix a incorrect class cast in GameControllerPreferenceCtrl
Fan Zhang [Thu, 12 Apr 2018 05:14:57 +0000 (13:14 +0800)]
Fix a incorrect class cast in GameControllerPreferenceCtrl

Also convert the controller to TogglePrefCtrl, and register it in xml.

Change-Id: Ifbc95364b47690117b2875cba1cdc4761ad205be
Bug: 71972185
Test: make RunSettingsRoboTests

6 years agoFixes crash in security settings.
Doris Ling [Tue, 24 Apr 2018 20:19:27 +0000 (13:19 -0700)]
Fixes crash in security settings.

- save the loaded icon drawable to a local var, instead of setting it to
the tile.icon and later reset it, so that we will not run into the issue
that the icon will become null when this is called multiple times.

Change-Id: I0fc73961986cddd97ad1e74b0609ac47d011cc87
Fixes: 78445923
Test: make RunSettingsRoboTests

6 years agoFix Data warning title not translated. am: 1cf0dfd3b2
Doris Ling [Tue, 24 Apr 2018 22:55:40 +0000 (15:55 -0700)]
Fix Data warning title not translated. am: 1cf0dfd3b2
am: 432ff5e455

Change-Id: I22bdb65a2d91b1992a4890a1fdca6a01fca925aa

6 years agoFix Data warning title not translated.
Doris Ling [Tue, 24 Apr 2018 22:44:52 +0000 (15:44 -0700)]
Fix Data warning title not translated.
am: 1cf0dfd3b2

Change-Id: I8bb8187c3a70afbaa32674e56c4ede29b503b1e8

6 years agoFix Data warning title not translated.
Doris Ling [Tue, 24 Apr 2018 20:42:19 +0000 (13:42 -0700)]
Fix Data warning title not translated.

- change to use the title resource id instead of getting the title from
the preference, so that it can react to language change properly.

Change-Id: I7f4b3c49ef1622b3d90bf035597742cac6f7af3c
Fixes: 78318536
Test: run i18nscreenshots

6 years agoUpdate brightness percentage display logic to match sysui.
Fan Zhang [Tue, 24 Apr 2018 18:31:58 +0000 (11:31 -0700)]
Update brightness percentage display logic to match sysui.

The brightness raw value is in linear pace, we need to convert
it to gamma space to make it match the way sysui represents the
brightness level.

Bug: 73810208
Change-Id: Ic4551bbeff4a6af30f7af2871a79a7d797279edb
Fixes: 78173473
Test: robotests

6 years agoMerge "Add intent receiver in BatterySaverCondition" into pi-dev am: 465f6da15b
HJ ChangLiao [Tue, 24 Apr 2018 17:35:46 +0000 (10:35 -0700)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev am: 465f6da15b
am: f1a94be5d4

Change-Id: I2f04be621d0a121cfc51e6fefa02a493426172ad

6 years agoMerge "Add intent receiver in BatterySaverCondition" into pi-dev
HJ ChangLiao [Tue, 24 Apr 2018 17:23:56 +0000 (10:23 -0700)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev
am: 465f6da15b

Change-Id: Ie34ee8d62197bf7e4cfb2e25d5ff71445f2aa9a4

6 years agoMerge "Add intent receiver in BatterySaverCondition" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 17:19:52 +0000 (17:19 +0000)]
Merge "Add intent receiver in BatterySaverCondition" into pi-dev

6 years agoMerge "Switch to new checkPasswordHistory method" into pi-dev am: 4a1b84e613
Rubin Xu [Tue, 24 Apr 2018 13:33:31 +0000 (06:33 -0700)]
Merge "Switch to new checkPasswordHistory method" into pi-dev am: 4a1b84e613
am: 399675408d

Change-Id: I53198b254e2e93aee0ab8a7e980e46bd20745e05

6 years agoMerge "Switch to new checkPasswordHistory method" into pi-dev
Rubin Xu [Tue, 24 Apr 2018 13:23:16 +0000 (06:23 -0700)]
Merge "Switch to new checkPasswordHistory method" into pi-dev
am: 4a1b84e613

Change-Id: Ife2084277acf19f93352e23eae82eb38519a8be1

6 years agoMerge "Switch to new checkPasswordHistory method" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 13:06:57 +0000 (13:06 +0000)]
Merge "Switch to new checkPasswordHistory method" into pi-dev

6 years agoAdd intent receiver in BatterySaverCondition
HJ ChangLiao [Wed, 18 Apr 2018 09:28:21 +0000 (17:28 +0800)]
Add intent receiver in BatterySaverCondition

Receive ACTION_POWER_SAVE_MODE_CHANGING
to listen state and update immediately.

Change-Id: Iff2ebb262d95f43d0c970b32f326e3a3e6981a2a
Fixes: 78104542
Test: make RunSettingsRoboTests

6 years agoMerge "Fix RTL alignmnet of "eSIMs" in "Erase all data" page."
George Huang [Tue, 24 Apr 2018 02:28:35 +0000 (02:28 +0000)]
Merge "Fix RTL alignmnet of "eSIMs" in "Erase all data" page."

6 years agoFix footer text not translated in Magnification settings. am: b0877b390d
Doris Ling [Tue, 24 Apr 2018 02:00:53 +0000 (19:00 -0700)]
Fix footer text not translated in Magnification settings. am: b0877b390d
am: 84506b36c5

Change-Id: Iab1c7df7fb56b76f3dcacc13608d23bbdcfeda51

6 years agoFix footer text not translated in Magnification settings.
Doris Ling [Tue, 24 Apr 2018 01:49:08 +0000 (18:49 -0700)]
Fix footer text not translated in Magnification settings.
am: b0877b390d

Change-Id: I3ad2795e60b3f2147f9611b54b014aa491077ce7

6 years agoFix footer text not translated in Magnification settings.
Doris Ling [Fri, 20 Apr 2018 23:42:10 +0000 (16:42 -0700)]
Fix footer text not translated in Magnification settings.

- pass in the summary res id instead of the actual text when building
the launch bundle for the magnification settings.
- remove the title argument as we are passing the title res already,
which takes precedence.

Change-Id: I4ba624e1d9722aa980ea94c306df9a015a159555
Fixes: 78126057
Test: run i18nscreenshots

6 years agoCheck if boxes still available when restoring state
Salvador Martinez [Mon, 23 Apr 2018 23:52:25 +0000 (16:52 -0700)]
Check if boxes still available when restoring state

Apparently when the device is idle long enough the system will clean
up the dialog view for the hotspot band preference. This will cause
restore state to fail once it decides to pause the activity. To avoid
this we should make sure the boxes are not null.

Test: robotest
Bug: 78445411
Change-Id: I2a82b01f894f62be6c5209c78faddc4089aa6301

6 years agoMerge "Use entity header to show account name in sync detail page"
TreeHugger Robot [Mon, 23 Apr 2018 23:35:23 +0000 (23:35 +0000)]
Merge "Use entity header to show account name in sync detail page"

6 years agoMerge "Create a new string for keyboard disconnected state"
TreeHugger Robot [Mon, 23 Apr 2018 23:00:37 +0000 (23:00 +0000)]
Merge "Create a new string for keyboard disconnected state"

6 years agoUse entity header to show account name in sync detail page
Fan Zhang [Fri, 6 Apr 2018 00:47:40 +0000 (17:47 -0700)]
Use entity header to show account name in sync detail page

Also removed a bunch of outdated layout and drawables.

Change-Id: I38094d72b84fab1309163f641c4019349f5d6ee7
Fixes: 77657624
Test: visual

6 years agoMerge "Disable hidden network spinner on existing networks" into pi-dev am: ac951a69aa
Salvador Martinez [Mon, 23 Apr 2018 22:11:47 +0000 (15:11 -0700)]
Merge "Disable hidden network spinner on existing networks" into pi-dev am: ac951a69aa
am: 062dbc2054

Change-Id: I29b27335730594d70805a14ac74d948d6dbef509

6 years agoCreate a new string for keyboard disconnected state
Fan Zhang [Mon, 23 Apr 2018 21:58:39 +0000 (14:58 -0700)]
Create a new string for keyboard disconnected state

Change-Id: I454bbb3b8e0ee22c0f7a5a340b86dfd5607de86e
Fixes: 77957016
Test: robotests

6 years agoMerge "TrustAgentSettings use DashboardFragment"
TreeHugger Robot [Mon, 23 Apr 2018 21:57:05 +0000 (21:57 +0000)]
Merge "TrustAgentSettings use DashboardFragment"

6 years agoMerge "Disable hidden network spinner on existing networks" into pi-dev
Salvador Martinez [Mon, 23 Apr 2018 21:55:19 +0000 (14:55 -0700)]
Merge "Disable hidden network spinner on existing networks" into pi-dev
am: ac951a69aa

Change-Id: I2fcd1b9dbd807dee783ea0027ab7c9b8e2ff369e

6 years agoMerge "Disable hidden network spinner on existing networks" into pi-dev
TreeHugger Robot [Mon, 23 Apr 2018 21:38:55 +0000 (21:38 +0000)]
Merge "Disable hidden network spinner on existing networks" into pi-dev

6 years agoUpdate insert method for battery database am: 4bfbaa6047
Lei Yu [Mon, 23 Apr 2018 21:37:30 +0000 (14:37 -0700)]
Update insert method for battery database am: 4bfbaa6047
am: 71dca7d131

Change-Id: Id7d1247efd12ead31584e46126108b5370bd1101

6 years agoAdd primary key for anomaly database. am: 0fcddc77c7
Lei Yu [Mon, 23 Apr 2018 21:37:11 +0000 (14:37 -0700)]
Add primary key for anomaly database. am: 0fcddc77c7
am: 8870486f65

Change-Id: Ic89ea460dd33f740b3c7fe66cd0cbdd4de84e1ad

6 years agoUpdate insert method for battery database
Lei Yu [Mon, 23 Apr 2018 21:28:14 +0000 (14:28 -0700)]
Update insert method for battery database
am: 4bfbaa6047

Change-Id: I69bed4d6ae38dc101878e342e14aa33199f2e810

6 years agoAdd primary key for anomaly database.
Lei Yu [Mon, 23 Apr 2018 21:27:59 +0000 (14:27 -0700)]
Add primary key for anomaly database.
am: 0fcddc77c7

Change-Id: I92c7aae2bf77c31863fa1f8191bec104f73097b4

6 years agoTrustAgentSettings use DashboardFragment
Mill Chen [Fri, 13 Apr 2018 03:59:19 +0000 (03:59 +0000)]
TrustAgentSettings use DashboardFragment

- Remove dummy preference from trust_agent_setting.xml.
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.

Bug: 73899467
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.search
Test: atest SettingsGatewayTest UniquePreferenceTest
Change-Id: Ideae0c1e7311d7647cf522e01592822e565a0ff7

6 years agoUpdate insert method for battery database
Lei Yu [Fri, 20 Apr 2018 17:51:33 +0000 (10:51 -0700)]
Update insert method for battery database

1. Add conflict code to ignore the confliction and return -1 when
insert fails.
2. Add boolean return value to show whether insert sucessfully
3. Add unit test. We don't write robo test because robolectirc use
"update" to shadow "insert" operation, which returns the wrong data.

Bug: 77968649
Test: SettingsUnitTest
Change-Id: Ibd3b53cdb1796d74ea4a2ca1f067e2b302b939e9

6 years agoAdd primary key for anomaly database.
Lei Yu [Fri, 20 Apr 2018 00:37:18 +0000 (17:37 -0700)]
Add primary key for anomaly database.

In this case it won't insert the duplicate data. We don't do migration since
anomaly database only contains transient data.

Bug: 77968649
Test: test still pass
Change-Id: I638564d89ead008ec184b9a4db137436d47df5bc

6 years agoFix the wrong import
jackqdyulei [Mon, 23 Apr 2018 18:17:08 +0000 (11:17 -0700)]
Fix the wrong import

Use androidx.annotation.VisibleForTesting

Test: Build
Change-Id: I666118ac61c6ba36391203af0a5b51dc02024793

6 years agoDisable hidden network spinner on existing networks
Salvador Martinez [Mon, 23 Apr 2018 17:50:22 +0000 (10:50 -0700)]
Disable hidden network spinner on existing networks

We only want this to be modifiable if you are adding a network
manually, so this CL disables it for existing networks. You
can still see what the spinner is set to though.

Test: robotests
Bug: 78436456
Change-Id: If660e432eca2dabf5bd16881368657ee89fe5a57

6 years agoMerge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_I...
TreeHugger Robot [Mon, 23 Apr 2018 17:48:12 +0000 (17:48 +0000)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"

6 years agoMerge "Fix bugs in auto restriction." into pi-dev am: f6e2c19fcc
Lei Yu [Mon, 23 Apr 2018 17:13:31 +0000 (10:13 -0700)]
Merge "Fix bugs in auto restriction." into pi-dev am: f6e2c19fcc
am: a9e4d4a42a

Change-Id: If82969696eb492ea3875a0e0fb92f038024f00f9

6 years agoMerge "Fix the bug using wrong TimeUnit" into pi-dev am: 10280a53b0
Lei Yu [Mon, 23 Apr 2018 17:12:29 +0000 (10:12 -0700)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev am: 10280a53b0
am: a4ef6f51be

Change-Id: I6585d866d4a8e2c54783a874d09821dc727e4941

6 years agoMerge "Fix bugs in auto restriction." into pi-dev
Lei Yu [Mon, 23 Apr 2018 17:09:08 +0000 (10:09 -0700)]
Merge "Fix bugs in auto restriction." into pi-dev
am: f6e2c19fcc

Change-Id: I2fd187d163c789ade85c40e00d44f58fea18d0be

6 years agoMerge "Fix the bug using wrong TimeUnit" into pi-dev
Lei Yu [Mon, 23 Apr 2018 17:08:33 +0000 (10:08 -0700)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev
am: 10280a53b0

Change-Id: I8d90eec324ddfcb0123247e2e0e37aa6f6f94ab8

6 years agoMerge "Fix bugs in auto restriction." into pi-dev
Lei Yu [Mon, 23 Apr 2018 17:03:39 +0000 (17:03 +0000)]
Merge "Fix bugs in auto restriction." into pi-dev

6 years agoMerge "Fix the bug using wrong TimeUnit" into pi-dev
Lei Yu [Mon, 23 Apr 2018 16:59:47 +0000 (16:59 +0000)]
Merge "Fix the bug using wrong TimeUnit" into pi-dev

6 years agoMerge "Pick default notification setting for work profile" into pi-dev am: bb839f81e3
Pavel Grafov [Mon, 23 Apr 2018 16:51:49 +0000 (09:51 -0700)]
Merge "Pick default notification setting for work profile" into pi-dev am: bb839f81e3
am: 0bdd7cf4f2

Change-Id: Id9c0d04e816f891df7e180974af104edac04905e

6 years agoMerge "Pick default notification setting for work profile" into pi-dev
Pavel Grafov [Mon, 23 Apr 2018 16:48:26 +0000 (09:48 -0700)]
Merge "Pick default notification setting for work profile" into pi-dev
am: bb839f81e3

Change-Id: I8ccd32b12b9da892b5f38d4a95e3217bc8183dcc

6 years agoMerge "Pick default notification setting for work profile" into pi-dev
TreeHugger Robot [Mon, 23 Apr 2018 16:38:43 +0000 (16:38 +0000)]
Merge "Pick default notification setting for work profile" into pi-dev

6 years agoFix RTL alignmnet of "eSIMs" in "Erase all data" page.
George Huang [Thu, 19 Apr 2018 10:04:58 +0000 (18:04 +0800)]
Fix RTL alignmnet of "eSIMs" in "Erase all data" page.

"eSIMs" is not a RTL string, so it will align to left even we change to
RTL language like Urdu. We must set the textDirection of TextView to
"locale" to force it follow locale's direction. We don't use
textAlignment to set string direction because it contains list bullets,
and list bullets will still align to left.

Change-Id: I0eea2bed9f324bb071e413673227839b830921cf
Fixes: 77946796
Test: visual

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 77e716...
Bill Yi [Sat, 21 Apr 2018 05:17:53 +0000 (22:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 77e716e463  -s ours
am: 993bc3fcc6  -s ours

Change-Id: Ie3f3ccfe4883b4c03787305b49886babaad498b0

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 21 Apr 2018 05:13:51 +0000 (22:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 77e716e463  -s ours

Change-Id: I9696a4c10e97d66c36a4eaca2c1947cb528ecb01

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 05:09:44 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 21 Apr 2018 04:58:43 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years ago[automerger skipped] Merge "Catch exception when failing to create slice" into pi...
Fan Zhang [Sat, 21 Apr 2018 03:37:34 +0000 (20:37 -0700)]
[automerger skipped] Merge "Catch exception when failing to create slice" into pi-dev am: 524babb389
am: f060f89b6f  -s ours

Change-Id: I0ae2d9494634c7bb98b28a9022e4177f54a6414e

6 years agoMerge "Add keywords to Slices" into pi-dev am: 2f911e2e9e
Matthew Fritze [Sat, 21 Apr 2018 03:27:02 +0000 (20:27 -0700)]
Merge "Add keywords to Slices" into pi-dev am: 2f911e2e9e
am: 21521826d9

Change-Id: I38d9efabcdecf3c40f1af28ecd167e58c2586ca7

6 years agoMerge "Catch exception when failing to create slice" into pi-dev
Fan Zhang [Sat, 21 Apr 2018 02:24:45 +0000 (19:24 -0700)]
Merge "Catch exception when failing to create slice" into pi-dev
am: 524babb389

Change-Id: Iecb03d8889bb0a1b6f6f43f3b28070bfcc429dff

6 years agoMerge "Catch exception when failing to create slice" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 02:03:49 +0000 (02:03 +0000)]
Merge "Catch exception when failing to create slice" into pi-dev

6 years agoresolve merge conflicts of 42d0815115966edd3621edaae287c36e7232e1c1 to master
Salvador Martinez [Sat, 21 Apr 2018 01:09:30 +0000 (18:09 -0700)]
resolve merge conflicts of 42d0815115966edd3621edaae287c36e7232e1c1 to master

Change-Id: I949e09de6aade8d07857a2b8d4bd34a549795939

Bug: None
Test: I solemnly swear I tested this conflict resolution

6 years agoMerge "Add keywords to Slices" into pi-dev
Matthew Fritze [Sat, 21 Apr 2018 00:44:13 +0000 (17:44 -0700)]
Merge "Add keywords to Slices" into pi-dev
am: 2f911e2e9e

Change-Id: I55871dd10278feab58ec1ff6faf3f3bd672d9e68

6 years agoMerge "Update settings main page battery string" into pi-dev
Salvador Martinez [Sat, 21 Apr 2018 00:16:46 +0000 (17:16 -0700)]
Merge "Update settings main page battery string" into pi-dev
am: 681353f725

Change-Id: I5a56820ac50ebc322f1352767cfc6fdfe773b292

6 years agoCatch exception when failing to create slice
Fan Zhang [Fri, 20 Apr 2018 19:53:25 +0000 (12:53 -0700)]
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

6 years agoMerge "Catch exception when failing to create slice"
Fan Zhang [Fri, 20 Apr 2018 23:55:13 +0000 (23:55 +0000)]
Merge "Catch exception when failing to create slice"

6 years agoFix the bug using wrong TimeUnit
Lei Yu [Fri, 20 Apr 2018 23:26:21 +0000 (16:26 -0700)]
Fix the bug using wrong TimeUnit

It should use DAYS, not HOURS.

Change-Id: I26784822c86e58cad93d35b6772ea54af7efb8f5
Fixes: 78362305
Test: RunSettingsRoboTests

6 years agoMerge "Add keywords to Slices" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 23:30:18 +0000 (23:30 +0000)]
Merge "Add keywords to Slices" into pi-dev

6 years agoMerge "Update settings main page battery string" into pi-dev
Salvador Martinez [Fri, 20 Apr 2018 23:27:25 +0000 (23:27 +0000)]
Merge "Update settings main page battery string" into pi-dev

6 years agoCatch exception when failing to create slice
Fan Zhang [Fri, 20 Apr 2018 19:53:25 +0000 (12:53 -0700)]
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

6 years agoMerge "Add a default title for data_management pref."
TreeHugger Robot [Fri, 20 Apr 2018 22:27:03 +0000 (22:27 +0000)]
Merge "Add a default title for data_management pref."

6 years agoAdd keywords to Slices
Matthew Fritze [Thu, 19 Apr 2018 21:50:55 +0000 (14:50 -0700)]
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

6 years agoAdd a default title for data_management pref.
Fan Zhang [Fri, 20 Apr 2018 20:53:55 +0000 (13:53 -0700)]
Add a default title for data_management pref.

Bug: 78347031
Test: robotests in ag/3933037
Change-Id: I4d09c8dd27630caeb5c31a0093350437c676d2fb

6 years agoFix bugs in auto restriction.
Lei Yu [Wed, 18 Apr 2018 00:41:07 +0000 (17:41 -0700)]
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

6 years agoMigrate Settings to androidx.
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.

Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39

6 years agoCollapse notification advanced settings am: 5766d6e443
Julia Reynolds [Fri, 20 Apr 2018 19:41:02 +0000 (12:41 -0700)]
Collapse notification advanced settings am: 5766d6e443
am: b4127f1481

Change-Id: Ifca9c55f412baf3a1636e89daab5d022e28d0dfd

6 years agoCollapse notification advanced settings
Julia Reynolds [Fri, 20 Apr 2018 19:27:20 +0000 (12:27 -0700)]
Collapse notification advanced settings
am: 5766d6e443

Change-Id: I99aca23639a2e9b1562942f4c37aad0aa7088c52

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Apr 2018 17:37:50 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I93f8c6f0051cf15e218d1c761c300c7e16109165

6 years agoCollapse notification advanced settings
Julia Reynolds [Thu, 19 Apr 2018 17:15:29 +0000 (13:15 -0400)]
Collapse notification advanced settings

Leave footers visible outside of advanced

Test: visual inspection
Fixes: 77324998
Fixes: 38011858
Change-Id: I2d6fcb832b134bc97081f03a3ab38d593e943f76

6 years agoSwitch to new checkPasswordHistory method
Rubin Xu [Fri, 30 Mar 2018 19:51:24 +0000 (20:51 +0100)]
Switch to new checkPasswordHistory method

This is part of the fix that upgrades the hashing of password history
to a more secure design.

Bug: 32826058
Test: manual
Change-Id: Ib022c8db1f7b63f75b69d0177fa5f6be528a83c5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Apr 2018 16:59:18 +0000 (09:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie22a4a96e3ffdd81b95d4aee14fa619dd9e231a1
Auto-generated-cl: translation import

6 years agoPick default notification setting for work profile
Pavel Grafov [Fri, 20 Apr 2018 11:52:28 +0000 (12:52 +0100)]
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

6 years agoMerge "Fix crash on rotation" into pi-dev am: 3bdd65e255
Julia Reynolds [Fri, 20 Apr 2018 13:51:54 +0000 (06:51 -0700)]
Merge "Fix crash on rotation" into pi-dev am: 3bdd65e255
am: 60aa99a95c

Change-Id: I02a301bd9a83491acdf3c76e94a15253a3191e83

6 years agoMerge "Fix crash on rotation" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 13:42:59 +0000 (06:42 -0700)]
Merge "Fix crash on rotation" into pi-dev
am: 3bdd65e255

Change-Id: I5dda589d25d114bf3355886c29e6d1325a5250ad

6 years agoMerge "Fix crash on rotation" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 13:30:28 +0000 (13:30 +0000)]
Merge "Fix crash on rotation" into pi-dev