OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoRefactor carrier settings
jackqdyulei [Fri, 12 Oct 2018 20:50:28 +0000 (13:50 -0700)]
Refactor carrier settings

Only show it when:
1. It is in CDMA or GSM mode
2. CarrierConfig tell settings to show it

Bug: 114749736
Test: RunSettingsRoboTests

Change-Id: I45ecbc86c793ebec602142be208058e2043a2ba7

5 years agoRefactor CdmaApnPreference
jackqdyulei [Thu, 11 Oct 2018 23:54:14 +0000 (16:54 -0700)]
Refactor CdmaApnPreference

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I3d0203b7b5fb732e2814fb741761af4371924e9a

5 years agoRefactor CdmaSubscriptionListPreference
jackqdyulei [Thu, 11 Oct 2018 22:01:23 +0000 (15:01 -0700)]
Refactor CdmaSubscriptionListPreference

Extract CdmaBasePreferenceController that can be shared by all CDMA
PreferenceController. Also create new subscription controller to use
it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7cfc27ffd0704d09dc02e49fbf5641ff8b90642d

5 years ago[automerger skipped] resolve merge conflicts of a8af2d3664eab2eae6f670ef0fb79969010c3...
Stanley Tng [Tue, 16 Oct 2018 17:09:09 +0000 (10:09 -0700)]
[automerger skipped] resolve merge conflicts of a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus-aosp
am: 0cc7d9a2af  -s ours

Change-Id: I3e982eed82df2491208d560cf4671db308674299

5 years agoresolve merge conflicts of a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus...
Stanley Tng [Tue, 16 Oct 2018 04:56:50 +0000 (21:56 -0700)]
resolve merge conflicts of a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571

5 years agoMerge "Fix ActionDisabledByAdminDialogHelperTest"
TreeHugger Robot [Tue, 16 Oct 2018 00:54:51 +0000 (00:54 +0000)]
Merge "Fix ActionDisabledByAdminDialogHelperTest"

5 years agoresolve merge conflicts of 019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp...
Stanley Tng [Tue, 16 Oct 2018 00:30:02 +0000 (17:30 -0700)]
resolve merge conflicts of 019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358

5 years ago[automerger skipped] Import translations. DO NOT MERGE am: 2a1a5cba81 -s ours
Bill Yi [Mon, 15 Oct 2018 23:50:36 +0000 (16:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 2a1a5cba81  -s ours
am: dce00f9ae2  -s ours

Change-Id: I95de88756d3a50478a74f2d55acb2e4260fd626d

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Mon, 15 Oct 2018 23:27:31 +0000 (16:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 2a1a5cba81  -s ours

Change-Id: I79a8495fa76bbcb9dcee9e66a48ff4c3875f454d

5 years agoMerge "Get app info with correct user id."
Doris Ling [Mon, 15 Oct 2018 23:23:23 +0000 (23:23 +0000)]
Merge "Get app info with correct user id."

5 years agoMerge "Add Feature Flag for Hearing Aid Profile"
Treehugger Robot [Mon, 15 Oct 2018 23:10:41 +0000 (23:10 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"

5 years agoFix ActionDisabledByAdminDialogHelperTest
Philip P. Moltmann [Mon, 15 Oct 2018 21:30:34 +0000 (14:30 -0700)]
Fix ActionDisabledByAdminDialogHelperTest

- Revert user handling in setAdminSupportDetails to before my changes.
- Implement getUserProfiles in Settings-shadows as the the
  Settings-shadows do not forwarded to profiles the robolectric-default
  shadows

Test: make RunSettingsRoboTests
Change-Id: Idfd4722fe55a17c57d336db943904eb1aeb6e7ce

5 years agoMerge "Refactor CdmaSystemSelectListPreference"
TreeHugger Robot [Mon, 15 Oct 2018 20:08:31 +0000 (20:08 +0000)]
Merge "Refactor CdmaSystemSelectListPreference"

5 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Oct 2018 19:34:57 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702

5 years agoMerge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a...
Youming Ye [Mon, 15 Oct 2018 18:41:46 +0000 (11:41 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a am: 8bac59265e
am: 6293483fce

Change-Id: I5b533e911f1185bb9fe1847701e333093b49926e

5 years agoMerge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
Youming Ye [Mon, 15 Oct 2018 17:59:04 +0000 (10:59 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
am: 8bac59265e

Change-Id: If28ef5f32183918404896ed395a49c9c2d87067a

5 years agoMerge "Fix error message shown when SIM PIN enable/disable fails"
Youming Ye [Mon, 15 Oct 2018 17:42:52 +0000 (10:42 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
am: f29392303a

Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414

5 years agoMerge "Use renamed restricted icon size config-value"
Philip P. Moltmann [Mon, 15 Oct 2018 17:16:55 +0000 (17:16 +0000)]
Merge "Use renamed restricted icon size config-value"

5 years agoMerge "Fix error message shown when SIM PIN enable/disable fails"
Youming Ye [Mon, 15 Oct 2018 17:08:22 +0000 (17:08 +0000)]
Merge "Fix error message shown when SIM PIN enable/disable fails"

5 years agoMerge "Use SYSTEM_... window manager flags"
Philip P. Moltmann [Mon, 15 Oct 2018 16:28:39 +0000 (16:28 +0000)]
Merge "Use SYSTEM_... window manager flags"

5 years agoMerge "Filter out the connected device in "Available devices" screen(1/2)"
TreeHugger Robot [Mon, 15 Oct 2018 12:44:38 +0000 (12:44 +0000)]
Merge "Filter out the connected device in "Available devices" screen(1/2)"

5 years ago[automerger skipped] Import translations. DO NOT MERGE am: ebb0bbe3f7 -s ours
Bill Yi [Mon, 15 Oct 2018 10:53:37 +0000 (03:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: ebb0bbe3f7  -s ours
am: 31398ce165  -s ours

Change-Id: Ib10a86be266ca60ed857134d4402ba33cb040c46

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Mon, 15 Oct 2018 10:42:41 +0000 (03:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: ebb0bbe3f7  -s ours

Change-Id: I0b288ed9e17d6598d7b20cc724ea88a42309d984

5 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Oct 2018 08:55:17 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE

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

5 years agoFilter out the connected device in "Available devices" screen(1/2)
Ash_Chen [Fri, 31 Aug 2018 13:28:57 +0000 (21:28 +0800)]
Filter out the connected device in "Available devices" screen(1/2)

Don't add connected devices under "Available devices"

Bug: 113568981
Test: Bluetooth Pairing Test with some devices and accessories
Change-Id: I2cce35cd5c237ea90cf1c128e951816474c7a658

5 years agoAdd Feature Flag for Hearing Aid Profile
Stanley Tng [Wed, 20 Jun 2018 22:32:02 +0000 (15:32 -0700)]
Add Feature Flag for Hearing Aid Profile

Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116725094
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit 068c2547f6f877273b09bf3ace5b4a4b61c7647a)

5 years agoMerge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6...
Brad Ebinger [Fri, 12 Oct 2018 23:13:58 +0000 (16:13 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6 am: 59eb9e9d90
am: be94f07e8d

Change-Id: I7c7277c9108afda3809415bc174baa7939fedac8

5 years agoMerge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6
Brad Ebinger [Fri, 12 Oct 2018 23:07:09 +0000 (16:07 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6
am: 59eb9e9d90

Change-Id: Ia0f24f55c529b166cfcd2bba4ca7af85d2e70759

5 years agoMerge "RadioInfo: Disable ims provisioning switches in USER-build"
Brad Ebinger [Fri, 12 Oct 2018 23:03:02 +0000 (16:03 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am: 61c5a296e6

Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998

5 years agoMerge "RadioInfo: Disable ims provisioning switches in USER-build"
Brad Ebinger [Fri, 12 Oct 2018 22:46:21 +0000 (22:46 +0000)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"

5 years agoMerge "Move content later button doesn't work on Migration Wizard" am: 1308b56908...
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:21:52 +0000 (14:21 -0700)]
Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908 am: d77dfa200e
am: 7cb8223ce2

Change-Id: I18c7e985c8a1f5e3f4cbc0cdeb980aee9464218d

5 years agoMerge "Move content later button doesn't work on Migration Wizard" am: 1308b56908
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:14:33 +0000 (14:14 -0700)]
Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908
am: d77dfa200e

Change-Id: I88e0b556594e5bdadf3c12d0c1fd0483f928261a

5 years agoMerge "Move content later button doesn't work on Migration Wizard"
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:07:25 +0000 (14:07 -0700)]
Merge "Move content later button doesn't work on Migration Wizard"
am: 1308b56908

Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9

5 years agoMerge "Move content later button doesn't work on Migration Wizard"
Treehugger Robot [Fri, 12 Oct 2018 20:52:31 +0000 (20:52 +0000)]
Merge "Move content later button doesn't work on Migration Wizard"

5 years agoRefactor CdmaSystemSelectListPreference
jackqdyulei [Tue, 9 Oct 2018 23:08:44 +0000 (16:08 -0700)]
Refactor CdmaSystemSelectListPreference

Most logic is copied from previous ListPreference however
1. Create PreferenceController for it
2. Extract API to check whether to display CMDA options
3. In controller, provide API to force display dialog

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Ic40d2ac1dc1854df9c90d912ea9fc822531b413d

5 years agoClean up unnecessary spy context statements
Mill Chen [Fri, 12 Oct 2018 13:39:04 +0000 (21:39 +0800)]
Clean up unnecessary spy context statements

Remove spy context syntax because we do not need to
mock context anymore in the test cases.

Bug: 117644158
Test: robotests
Change-Id: I222eec4fbc1994d7bb79adead40b76ac0a000bdc

5 years agoMerge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24
Neil Fuller [Fri, 12 Oct 2018 10:42:13 +0000 (03:42 -0700)]
Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24
am: 92982f7167

Change-Id: Iad9b91446823430cb28dd3447819c6b16f7f6b42

5 years agoMerge "Remove explicit dependency on bouncycastle" am: ed21203ea3
Neil Fuller [Fri, 12 Oct 2018 10:36:17 +0000 (03:36 -0700)]
Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3
am: 6767ce9d24

Change-Id: Ia431a5b7ca139209425825616f698f69bfb781c5

5 years agoMerge "Remove explicit dependency on bouncycastle"
Neil Fuller [Fri, 12 Oct 2018 10:31:10 +0000 (03:31 -0700)]
Merge "Remove explicit dependency on bouncycastle"
am: ed21203ea3

Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450

5 years agoMerge "Remove explicit dependency on bouncycastle"
Neil Fuller [Fri, 12 Oct 2018 10:18:22 +0000 (10:18 +0000)]
Merge "Remove explicit dependency on bouncycastle"

5 years agoMerge "Disable sliceView scrolling in the homepage."
TreeHugger Robot [Fri, 12 Oct 2018 05:05:03 +0000 (05:05 +0000)]
Merge "Disable sliceView scrolling in the homepage."

5 years agoMerge "Proceed to "finish" page upon completing enrollment"
TreeHugger Robot [Fri, 12 Oct 2018 03:56:26 +0000 (03:56 +0000)]
Merge "Proceed to "finish" page upon completing enrollment"

5 years agoDisable sliceView scrolling in the homepage.
Emily Chuang [Thu, 11 Oct 2018 10:23:45 +0000 (18:23 +0800)]
Disable sliceView scrolling in the homepage.

Set isScrollable() to false so as to have the "see more" option.

Fixes: 117626982
Test: robotest
Change-Id: Ie0b8a207fb0c1eff41a98cc897e5f8cf29ccce0a

5 years agoProceed to "finish" page upon completing enrollment
Kevin Chyn [Fri, 12 Oct 2018 01:26:37 +0000 (18:26 -0700)]
Proceed to "finish" page upon completing enrollment

Bug: 111548037

Test: manual
Change-Id: I1c0c5cc0eb2d1808221465c5eeba92e59b2cd572

5 years agoGet app info with correct user id.
Doris Ling [Thu, 11 Oct 2018 23:37:32 +0000 (16:37 -0700)]
Get app info with correct user id.

- when querying app info from package manager, we should use the methods
that takes the user id so that it will work properly with managed
profile.

Change-Id: Ifc84d3a29aaf7b2c1acfa096596a53f1715cc908
Fixes: 117222623
Test: make RunSettingsRoboTests

5 years agoMerge "Change packagename to telephony"
Lei Yu [Thu, 11 Oct 2018 22:32:31 +0000 (22:32 +0000)]
Merge "Change packagename to telephony"

5 years agoMerge "Fix crash on KeyboardLayoutDialogFragment"
TreeHugger Robot [Thu, 11 Oct 2018 20:31:44 +0000 (20:31 +0000)]
Merge "Fix crash on KeyboardLayoutDialogFragment"

5 years agoUse renamed restricted icon size config-value
Philip P. Moltmann [Thu, 11 Oct 2018 19:42:26 +0000 (12:42 -0700)]
Use renamed restricted icon size config-value

Bug: 116797641
Test: Built
Change-Id: I913d7fece475e19969f9d932c0992242308bb02f

5 years agoChange packagename to telephony
jackqdyulei [Thu, 11 Oct 2018 18:13:26 +0000 (11:13 -0700)]
Change packagename to telephony

Also move it under package network, so all of them belong to
com.android.settings.network.telephony.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1

5 years agoFix crash on KeyboardLayoutDialogFragment
tmfang [Thu, 11 Oct 2018 10:26:37 +0000 (18:26 +0800)]
Fix crash on KeyboardLayoutDialogFragment

Since view id changed after fragment migration,
we correct view id.

Change-Id: If81ca06423ac62fd9f6a118be0b5fe3c93356142
Fixes: 117559309
Test: robotest

5 years agoMerge "Fix problem on filter widget in memory page"
TreeHugger Robot [Thu, 11 Oct 2018 16:46:17 +0000 (16:46 +0000)]
Merge "Fix problem on filter widget in memory page"

5 years agoRemove explicit dependency on bouncycastle
Neil Fuller [Tue, 2 Oct 2018 20:37:30 +0000 (21:37 +0100)]
Remove explicit dependency on bouncycastle

The dependency is unnecessary once bouncycastle
is included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a

5 years agoFix problem on filter widget in memory page
tmfang [Thu, 11 Oct 2018 05:41:53 +0000 (13:41 +0800)]
Fix problem on filter widget in memory page

We need to use SettingsSpinnerAdapater
with settings style item.

Test: visual
Bug: 117568930
Change-Id: Ia60b7d08c11a270e029e6b673a12d838f454eccf
Fixes: 117541499

5 years agoMerge "Copy wifiCalling method from telephony to settings"
Lei Yu [Thu, 11 Oct 2018 04:11:07 +0000 (04:11 +0000)]
Merge "Copy wifiCalling method from telephony to settings"

5 years agoMerge "Change search fab to search bar."
TreeHugger Robot [Thu, 11 Oct 2018 02:42:24 +0000 (02:42 +0000)]
Merge "Change search fab to search bar."

5 years agoMerge "Add network listener in MobileSettingsActivity"
Lei Yu [Thu, 11 Oct 2018 01:14:09 +0000 (01:14 +0000)]
Merge "Add network listener in MobileSettingsActivity"

5 years agoMerge "Add target fragment for RoamingDialogFragment"
Lei Yu [Thu, 11 Oct 2018 00:25:18 +0000 (00:25 +0000)]
Merge "Add target fragment for RoamingDialogFragment"

5 years agoMerge "Refactor MobileDataPreference"
Lei Yu [Thu, 11 Oct 2018 00:24:56 +0000 (00:24 +0000)]
Merge "Refactor MobileDataPreference"

5 years agoChange search fab to search bar.
Fan Zhang [Wed, 10 Oct 2018 22:25:47 +0000 (15:25 -0700)]
Change search fab to search bar.

- Remove search fab from layout xml
- Change RelativeLayout to CoordinatorLayout so we can use prebuilt
  scrolling behavior
- Minor update to theme so search bar background works in dark mode for
  the homepage activity.

Change-Id: If7408c12684be65137e04ae3bb4137204c2d77e0
Fixes: 117508596
Test: robotests, visual

5 years agoMerge "Remove ShadowKeyValueListParser"
TreeHugger Robot [Wed, 10 Oct 2018 23:23:41 +0000 (23:23 +0000)]
Merge "Remove ShadowKeyValueListParser"

5 years agoCopy wifiCalling method from telephony to settings
jackqdyulei [Tue, 9 Oct 2018 20:13:55 +0000 (13:13 -0700)]
Copy wifiCalling method from telephony to settings

Bug: 114749736
Test: Build
Change-Id: Iec45273e6a74afe940c280e50a473edc31473994

5 years agoAdd target fragment for RoamingDialogFragment
jackqdyulei [Tue, 9 Oct 2018 20:24:06 +0000 (13:24 -0700)]
Add target fragment for RoamingDialogFragment

Bug: 114749736
Test: Manual
Change-Id: I6f2939d99b72ff2dcf094c84bac75c2ca5d7ff66

5 years agoAdd network listener in MobileSettingsActivity
jackqdyulei [Tue, 9 Oct 2018 19:26:51 +0000 (12:26 -0700)]
Add network listener in MobileSettingsActivity

Listen to subscription change. If it is changed, refresh UI and build
new fragment for it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I436b4d62b06230e767892bda6cf8582d4946097b

5 years agoRefactor MobileDataPreference
jackqdyulei [Mon, 8 Oct 2018 22:13:53 +0000 (15:13 -0700)]
Refactor MobileDataPreference

1. Remove it and change it to SwitchPrference
2. Build MobileDataDialogFragment to show dialog when needed
3. Create controller for it to decide when to launch the dialog

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I02b9662c5829e765f2c71d10ed951d792cf7aaa1

5 years agoMerge "Update strings"
Fan Zhang [Wed, 10 Oct 2018 20:56:49 +0000 (20:56 +0000)]
Merge "Update strings"

5 years agoMerge "Use default network template in billing cycle settings."
TreeHugger Robot [Wed, 10 Oct 2018 20:53:55 +0000 (20:53 +0000)]
Merge "Use default network template in billing cycle settings."

5 years agoRemove ShadowKeyValueListParser
jackqdyulei [Wed, 10 Oct 2018 20:43:01 +0000 (13:43 -0700)]
Remove ShadowKeyValueListParser

It is not used anymore.

Change-Id: I52991f42bc0872fd98809d6d6596f4b85d041d60
Fixes: 38346649
Test: RunSettingsRoboTests

5 years agoMerge "Use proto in contextualCard object"
Fan Zhang [Wed, 10 Oct 2018 20:19:38 +0000 (20:19 +0000)]
Merge "Use proto in contextualCard object"

5 years agoMerge "Remove mocked resources from slice test cases"
Fan Zhang [Wed, 10 Oct 2018 20:13:52 +0000 (20:13 +0000)]
Merge "Remove mocked resources from slice test cases"

5 years agoMerge "Use AFM.getAutofillServiceComponentName() in Settings's AutofillPickerTrampoli...
Adam He [Wed, 10 Oct 2018 19:54:50 +0000 (19:54 +0000)]
Merge "Use AFM.getAutofillServiceComponentName() in Settings's AutofillPickerTrampolineActivity"

5 years agoUse default network template in billing cycle settings.
Doris Ling [Wed, 10 Oct 2018 00:10:34 +0000 (17:10 -0700)]
Use default network template in billing cycle settings.

- if the network template is not set in the bundle arguments, use the
default network template for getting the billing data.
- change to use ConnectivityManager.from(context) in DataUsageUtils to
be consistent with the usage in other methods.

Change-Id: I25eb27f8f26d9ecafc66aa2c69806e94c6b63499
Fixes: 117452991
Test: make RunSettingsRoboTests

5 years agoMerge "Use new RestrictedLockUtils API"
Philip P. Moltmann [Wed, 10 Oct 2018 19:50:06 +0000 (19:50 +0000)]
Merge "Use new RestrictedLockUtils API"

5 years ago[automerger skipped] Merge "Add null check for vrManager" into pi-dev am: c9e2d80ade
Rick Yiu [Wed, 10 Oct 2018 19:06:58 +0000 (12:06 -0700)]
[automerger skipped] Merge "Add null check for vrManager" into pi-dev am: c9e2d80ade
am: 31e062e640  -s ours

Change-Id: Ia572567d053c0e00cdafeeae71314187720ff9de

5 years agoMerge "Get the ringtone name in background thread."
TreeHugger Robot [Wed, 10 Oct 2018 18:54:20 +0000 (18:54 +0000)]
Merge "Get the ringtone name in background thread."

5 years agoUpdate strings
Fan Zhang [Wed, 10 Oct 2018 18:16:02 +0000 (11:16 -0700)]
Update strings

Change-Id: I3a70d787e6db6743638460195f36386111647e4e
Fixes: 117508849
Test: visual

5 years agoMerge "Add null check for vrManager" into pi-dev
Rick Yiu [Wed, 10 Oct 2018 18:07:11 +0000 (11:07 -0700)]
Merge "Add null check for vrManager" into pi-dev
am: c9e2d80ade

Change-Id: Ifb1f2da7e3493e91f26735e7609c4480b1f0f346

5 years agoMerge "Add null check for vrManager" into pi-dev
TreeHugger Robot [Wed, 10 Oct 2018 17:46:55 +0000 (17:46 +0000)]
Merge "Add null check for vrManager" into pi-dev

5 years agoUse proto in contextualCard object
Raff Tsai [Mon, 8 Oct 2018 19:15:04 +0000 (03:15 +0800)]
Use proto in contextualCard object

Test: make RunSettingsRoboTests
Change-Id: Ic7af69047e33e3b10a993dd9820b4c6ceb23666c

5 years agoMerge "Add contextual card proto libraries."
Fan Zhang [Wed, 10 Oct 2018 17:24:02 +0000 (17:24 +0000)]
Merge "Add contextual card proto libraries."

5 years agoAdd contextual card proto libraries.
Fan Zhang [Tue, 9 Oct 2018 23:12:34 +0000 (16:12 -0700)]
Add contextual card proto libraries.

Test: rebuild
Change-Id: Ifd105a91be4ce3b3ae35766e069d4b4663e54b0f

5 years agoMerge "Remove hacks to access framework private resources"
Fan Zhang [Wed, 10 Oct 2018 17:10:12 +0000 (17:10 +0000)]
Merge "Remove hacks to access framework private resources"

5 years agoRadioInfo: Disable ims provisioning switches in USER-build
Sreekanth Badida [Mon, 5 Feb 2018 16:18:40 +0000 (17:18 +0100)]
RadioInfo: Disable ims provisioning switches in USER-build

Disables provisioning switches for Ims-related features in the RadioInfo
dialog when using USER-build. This prevents the user from circumventing
ims provisioning checks.

Bug: 78372174
Test: Manual
Change-Id: If538d7ed56ca53ae6a8be31ddf374d9a15a8fdec

5 years agoFix test case error
Raff Tsai [Wed, 10 Oct 2018 13:06:19 +0000 (21:06 +0800)]
Fix test case error

Test: make RunSettingsRoboTest
Change-Id: Id8e13cdd13b4a5f21dad5f84be7110ca8cf5282f

5 years agoGet the ringtone name in background thread.
Doris Ling [Wed, 10 Oct 2018 00:48:34 +0000 (17:48 -0700)]
Get the ringtone name in background thread.

- to prevent anr, retrieve the current ringtone in background thread.

Change-Id: I701adfa618553c03aa24719b2550ea3ee97d9bfa
Fixes: 117124470
Test: make RunSettingsRoboTests

5 years agoUse SYSTEM_... window manager flags
Philip P. Moltmann [Tue, 9 Oct 2018 20:45:10 +0000 (13:45 -0700)]
Use SYSTEM_... window manager flags

Test: Built
Bug: 116798569
Change-Id: Iac0728b348b6105b843d83415f0abde2de3cb074

5 years agoUse new RestrictedLockUtils API
Philip P. Moltmann [Mon, 8 Oct 2018 17:46:04 +0000 (10:46 -0700)]
Use new RestrictedLockUtils API

This is made necessary by changes to the SystemAPI the lib relies on.

Test: RunSettingsRoboTests
Bug: 116798569
Change-Id: I2812ce9e58e3fb15a5579ddc10cd0edf33d0ed44

5 years agoMerge "Add entitlement check for usb tethering"
TreeHugger Robot [Tue, 9 Oct 2018 19:16:07 +0000 (19:16 +0000)]
Merge "Add entitlement check for usb tethering"

5 years agoMerge "Add a filter to take out unnecessary homepage data."
Fan Zhang [Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)]
Merge "Add a filter to take out unnecessary homepage data."

5 years agoMerge "Add storage slice in Contextual Settings Homepage"
Fan Zhang [Tue, 9 Oct 2018 16:45:35 +0000 (16:45 +0000)]
Merge "Add storage slice in Contextual Settings Homepage"

5 years agoMerge "Allow DND events rule to choose custom calendars"
TreeHugger Robot [Tue, 9 Oct 2018 16:25:22 +0000 (16:25 +0000)]
Merge "Allow DND events rule to choose custom calendars"

5 years agoRemove mocked resources from slice test cases
Mill Chen [Tue, 9 Oct 2018 15:25:44 +0000 (23:25 +0800)]
Remove mocked resources from slice test cases

Clean up some resources which are useless for the moment.

Bug: 117485451
Test: robotests
Change-Id: Id3591178791cc6c9f628a99a8916e9007a399728

5 years agoAdd a filter to take out unnecessary homepage data.
Emily Chuang [Mon, 1 Oct 2018 11:21:23 +0000 (19:21 +0800)]
Add a filter to take out unnecessary homepage data.

After getting the full list from CardContentProvider, at render side
(Settings side) we should perform final filtering to filter out those
data that are not applicable at that moment. Apart from that, we should
also perform slice URI check in this stage to take out invalid slices.

Bug: 116063073
Test: robotests
Change-Id: Idfa94ec6176a9d9cb3379543e0a23858941af742

5 years agoAdd storage slice in Contextual Settings Homepage
Mill Chen [Mon, 1 Oct 2018 08:47:12 +0000 (16:47 +0800)]
Add storage slice in Contextual Settings Homepage

- Add storage card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for storage slice.

Bug: 117074909115971399
Test: visual, robotest, SliceBrowser
Change-Id: Idc7d47ba934c2556c124220545ecc73fb2beb7e2

5 years agoMerge "Use custom drop-down filter widget"
TreeHugger Robot [Tue, 9 Oct 2018 05:29:15 +0000 (05:29 +0000)]
Merge "Use custom drop-down filter widget"

5 years agoRemove hacks to access framework private resources
Maurice Lam [Tue, 9 Oct 2018 02:29:03 +0000 (19:29 -0700)]
Remove hacks to access framework private resources

ag/5200295 now allows framework private resources to be resolved.

Test: atest RunSettingsRoboTests
Change-Id: Idaf2144bea6d3b44ec133e48d89e6674256b4cbe

5 years agoMerge "Add device info slice in Contextual Settings Homepage"
Mill Chen [Tue, 9 Oct 2018 01:49:17 +0000 (01:49 +0000)]
Merge "Add device info slice in Contextual Settings Homepage"

5 years agoMerge "Ignore lock type in ChooseLockGeneric in non-FBE"
Maurice Lam [Tue, 9 Oct 2018 01:02:25 +0000 (01:02 +0000)]
Merge "Ignore lock type in ChooseLockGeneric in non-FBE"

5 years agoMerge "Remove obsolete chart view widgets."
TreeHugger Robot [Mon, 8 Oct 2018 23:00:06 +0000 (23:00 +0000)]
Merge "Remove obsolete chart view widgets."

5 years agoMerge changes I3008bf85,I43aebf2e,I4fda0708,I744d5376
Lei Yu [Mon, 8 Oct 2018 22:12:26 +0000 (22:12 +0000)]
Merge changes I3008bf85,I43aebf2e,I4fda0708,I744d5376

* changes:
  Remove AdvancedOptionsPreference
  Add activity for mobile network page
  Fix the complie error of network migration
  Copy MobileNetworkSettings to settings app

5 years agoMerge "Remove DeviceIndex feature/service."
TreeHugger Robot [Mon, 8 Oct 2018 22:11:24 +0000 (22:11 +0000)]
Merge "Remove DeviceIndex feature/service."