Commit Graph

22265 Commits

Author SHA1 Message Date
Hemant Gupta
ff985c6bc7 Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
am: 84bb2293ae

Change-Id: Ief10c8b5b3cdae90ba37a6349528f85e59562dc9
2018-08-17 12:11:27 -07:00
Treehugger Robot
84bb2293ae Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" 2018-08-17 18:05:21 +00:00
ChenChen Chen
0173130d73 Merge "Always show items in options menu for Wi-Fi Direct settings"
am: 1e160cc8bf

Change-Id: Ie1edf750d2f205be97b07c84429e2c1468aa6c58
2018-08-16 17:39:00 -07:00
ChenChen Chen
16d1bf0cde Always show items in options menu for Wi-Fi Direct settings
Remove MenuItem.SHOW_AS_ACTION_IF_ROOM flag for menu items
to avoid showing truncated texts on action bar.

Bug: 112671955
Test: Manual
Change-Id: I1c9678321442169bc86d719e820d4af68261dee1
2018-08-16 15:13:33 +09:00
Jordan Liu
114cacf2a8 Merge "Refresh subscription info when subid changes"
am: 5226ac6110

Change-Id: I874fb7e8f3d3146cb614de3ee088e93c1863a592
2018-08-15 16:29:14 -07:00
Jordan Liu
b1facd2001 Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().

Fixes: 111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
2018-08-15 11:37:24 -07:00
Jordan Liu
b951ba66e5 Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
am: 5b7535d5b4

Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
2018-08-14 20:09:31 -07:00
irisykyang
40f4f799bb Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug: 77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
2018-08-14 15:55:43 -07:00
Jordan Liu
efd3dd02b6 Merge "Preserve leading 0s in mcc mnc" am: 593d767e15
am: c2a5c47290

Change-Id: Id1a84cc4cc55fef4167f28ab0e665ebffe5d2c05
2018-08-08 15:50:24 -07:00
Jordan Liu
f546b97db9 Preserve leading 0s in mcc mnc
Fixes: 79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
2018-08-08 11:35:15 -07:00
Brad Ebinger
aca1e304bd Merge "IMS: Use the slot based ImsManager factory reset API." am: 9e4ff6fca6
am: 15ca33865c

Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899
2018-07-16 13:55:25 -07:00
Brad Ebinger
15ca33865c Merge "IMS: Use the slot based ImsManager factory reset API."
am: 9e4ff6fca6

Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
2018-07-16 13:32:55 -07:00
Brad Ebinger
9e4ff6fca6 Merge "IMS: Use the slot based ImsManager factory reset API." 2018-07-16 19:57:31 +00:00
xiamin
7ed2928876 Merge "new password shouldn't be empty string" am: dd7bd6b15a
am: bfb61ed2ed

Change-Id: I97c536fc0aaaec4e317944564519a908a762e9f5
2018-07-11 15:16:20 -07:00
xiamin
bfb61ed2ed Merge "new password shouldn't be empty string"
am: dd7bd6b15a

Change-Id: I8e3fb81aba487df22573b6fa67a36e2973c9a54b
2018-07-11 14:51:09 -07:00
Salvador Martinez
94bebd2f80 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
am: 4804c2c7a5

Change-Id: I81b835965ee39d8c877e834820ca21543d18d654
2018-07-10 12:41:50 -07:00
TreeHugger Robot
4804c2c7a5 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev 2018-07-10 19:33:29 +00:00
xiamin
3c2956a08c new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.

Bug: https://partnerissuetracker.corp.google.com/u/2/issues/111261338
Test: empty string can not be set as a password

Signed-off-by: xiamin <xiamin@xiaomi.com>
2018-07-10 10:48:56 +08:00
Salvador Martinez
78c3f368c3 Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.

Test: robotests updated
Bug: 110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
2018-07-09 11:52:34 -07:00
Pavel Grafov
0886bf2271 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am: dc2db6c6c9

Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2
2018-07-09 10:49:22 -07:00
Pavel Grafov
f9429262d2 Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.

Bug: 111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit f14de789f4)
2018-07-04 13:02:03 +00:00
Matthew Fritze
76acf317a5 Merge "Conditionally block battery percantage from search" into pi-dev
am: ea97a66383

Change-Id: If61f6e81aebd70c88e8fc75a525f53bed3ddbac1
2018-07-03 14:39:07 -07:00
TreeHugger Robot
ea97a66383 Merge "Conditionally block battery percantage from search" into pi-dev 2018-07-03 21:35:32 +00:00
Lei Yu
13d51cd39a Merge "Unrestrict app if it been set as device admin app" into pi-dev
am: f406fd7976

Change-Id: Ic085eeee8d18999d56e7432bb13af342c0e00786
2018-07-03 13:42:30 -07:00
TreeHugger Robot
f406fd7976 Merge "Unrestrict app if it been set as device admin app" into pi-dev 2018-07-03 20:24:58 +00:00
Matthew Fritze
5e8005db42 Conditionally block battery percantage from search
The PowerUsageSummary fragment doesn't use the regular pattern
of a static method to build preference controllers, which can be
accessed by both DashboardFragment and BaseSearchIndexProvider,
because it depends on the Activity & Fragment in the creation of
the preference controllers.

The correct & long-term solution here would be to move those dependencies
out of the getPreferenceControllers method, such that the we could use a
static buildPreferenceControllers method, as seen in DisplaySettings.java.

In the mean time, we know that BatteryPercentagePrefController should not
show up on devices, so we conditionally add the the preference controller's
into getNonIndexableKeys method based on controller Availability, which
BasePreferenceController normally does automatically with a getPreferenceController
method in the host fragment's SEARCH_INDEX_DATA_PROVIDER.

Since this is a short-term solution, it should not be merged into master, and thus
I am not marking the bug as fixed.

Bug: 110894466
Test: Robotests
Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd
Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a
2018-07-03 18:32:35 +00:00
Lei Yu
f87897b84c Unrestrict app if it been set as device admin app
Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
2018-07-02 18:07:25 -07:00
Hemant Gupta
453534d210 Bluetooth: PBAP not disconnected on disabling contact sharing
Precondition: Contact Sharing is checked and there is PBAP Connection.

Usecase:
1) Establish PBAP Connection.
2) Disable "Contact Sharing" button.
3) Check if PBAP is Disconnected or not.

Issue:
PBAP Profile Disconnection is not triggered.

Root Cause:
Change in Setting menu UI by removal of "Disable Profile"
dialog box (like Android O) has resulted in not invoking
PBAP Disconnect call from Setting App.

Fix:
Handle Disconnection for PBAP from API disableProfile() at
settings/bluetooth/BluetoothDetailsProfilesController.java
like other profiles.

Test: Issue is not seen as per above usecase.

Bug: 110515410
Change-Id: Ibd18fb836e10e79e99e6b04127ae181134201cef
2018-06-22 08:21:47 +05:30
Salvador Martinez
4dc79faefb Merge "Add unofficial intent for WifiTetherSettings" into pi-dev
am: ce58bf2ee9

Change-Id: I4874f7186a45a6d2792e42b708467010e3960db6
2018-06-21 15:25:13 -07:00
Salvador Martinez
ce58bf2ee9 Merge "Add unofficial intent for WifiTetherSettings" into pi-dev 2018-06-21 22:21:20 +00:00
Evan Laird
77e399335e Merge "Allow config to disable battery percent setting" into pi-dev
am: 1f6c7910fb

Change-Id: Ief7df5312104e44bda140f68dd5e6821c2736bbf
2018-06-21 14:58:14 -07:00
TreeHugger Robot
1f6c7910fb Merge "Allow config to disable battery percent setting" into pi-dev 2018-06-21 21:18:36 +00:00
Ivan Chiang
8a0a3196fc Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev
am: 44505ef8cd

Change-Id: I39adc9974b57830940b983bc7d378359de0505fd
2018-06-20 21:05:45 -07:00
TreeHugger Robot
44505ef8cd Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev 2018-06-21 02:30:43 +00:00
Salvador Martinez
bb3337100c Add unofficial intent for WifiTetherSettings
This CL adds an intent that can be used to start
WifiTether Settings.

Test: SettingsGatewayTest still passes
Bug: 110235497
Bug: 80251951
Change-Id: Iac94e563a91b1f821f69f18234d8176350ae5f29
2018-06-20 09:17:08 -07:00
Daichi Ueura
bc77a7503d Merge "Show Wifi 'Off' status properly just after boot" am: 23482a54bb
am: 01dfcc4ea9

Change-Id: I45dd9479bd58d15f09c0a72b5e3fe71ee6f64d8a
2018-06-19 15:42:47 -07:00
Daichi Ueura
01dfcc4ea9 Merge "Show Wifi 'Off' status properly just after boot"
am: 23482a54bb

Change-Id: Icc111b50f52f5ed801d63bedfac851ba5dcc99c1
2018-06-19 15:36:47 -07:00
Daichi Ueura
f41d1605a3 Show Wifi 'Off' status properly just after boot
If Wifi is not enabled at boot, WIFI_STATE_CHANGED_ACTION
sticky intent is not present. This results in Wifi 'Off'
status is not shown. This patch handles such case by calling
notifyChangeIfNeeded at register to refresh status.

Bug: 110373099
Test: manual - Check status after device boot with wifi off
Change-Id: I009386b03ef3269b00ce403b86087664b295f397
2018-06-19 16:15:31 +09:00
Beverly
4ff9758072 Add help uri for prevent ringing gesture
am: 55dfd8a86b

Change-Id: Id9d2738a9225e6b655f027a25024cd25acbd091a
2018-06-14 12:28:08 -07:00
Evan Laird
7d9ec632f2 Allow config to disable battery percent setting
Respect config_battery_percentage_setting_available to determine whether
or not to allow showing battery percentage in the status bar.

Test: visual
Bug: 80129194
Change-Id: I23b0065ed99865a8df37c098b2f0f16d57799706
2018-06-13 20:13:47 -04:00
Pengquan Meng
1fc6859126 Merge "Remove internal ApnSetting."
am: 4079677883

Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
2018-06-13 15:33:56 -07:00
Beverly
55dfd8a86b Add help uri for prevent ringing gesture
Test: build
Bug: 79270169
Change-Id: Iea5598f26649854521202363cad6ee297cef3057
(cherry picked from commit 486d1facfa)
2018-06-13 13:25:31 +00:00
yuemingw
b98d538bbe Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.

Bug: 77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
2018-06-13 13:33:59 +01:00
Salvador Martinez
31a33ba6b6 Change UI for wireless AP tether band selection
am: acff57fa68

Change-Id: I47124f2fa50015eca97cee589b4a1f94f43123fd
2018-06-12 17:15:51 -07:00
Salvador Martinez
acff57fa68 Change UI for wireless AP tether band selection
We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred

Test: atest SettingsRoboTests
Bug: 80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378
2018-06-12 22:59:28 +00:00
yuemingw
ff73564ea0 Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.

Bug: 77511388
Test: existing test
Change-Id: I8ca1fb399026a8ef4ba9afa18678d986daa50606
2018-06-12 15:59:24 +00:00
Ivan Chiang
11cea132bd DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""
This reverts commit ca85cc9d27.

Reason for revert: This patch should be submitted with whole topic.

Bug: 80227045
Change-Id: I446329aa3370b64b2a943a0f970d0236258455a3
2018-06-12 15:33:06 +00:00
Artem Iglikov
270c692e7f Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
am: 5cb6b79400

Change-Id: I6c958dc1d0c4d87eeafe1855da6455f4185597da
2018-06-12 06:35:19 -07:00
TreeHugger Robot
5cb6b79400 Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev 2018-06-12 12:47:36 +00:00
Artem Iglikov
ca85cc9d27 DO NOT MERGE Revert "Fix gray out previously connected device preference issue"
This reverts commit 95abf59af4.

Reason for revert: Crashes settings (b/110075201)

Bug: 110075201
Change-Id: Ie6ea94e0891754f18576bd21447b64410d2fd23a
2018-06-12 11:55:31 +00:00