Commit Graph

46093 Commits

Author SHA1 Message Date
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
Bill Yi
219ffa7e4e [automerger skipped] Import translations. DO NOT MERGE
am: 20fa188802  -s ours

Change-Id: If51e678c0621df0150bb22fbcbee9b16964b1215
2018-07-02 19:27:51 -07:00
Bill Yi
20fa188802 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca
2018-07-02 18:11:20 -07: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
Fan Zhang
37f143d601 [automerger skipped] Delete obsolete activity alias for dev settings am: 0e1393ae8c am: afbdbeb7d5 am: 192cc156b0 -s ours
am: e9b64753e7  -s ours

Change-Id: Ida92ee646fe101c1c886fecc9351257435571d39
2018-06-27 22:07:14 -07:00
Fan Zhang
e9b64753e7 [automerger skipped] Delete obsolete activity alias for dev settings am: 0e1393ae8c am: afbdbeb7d5
am: 192cc156b0  -s ours

Change-Id: Ib02c4b16500eaf479106c2e70b02fdaa401141e7
2018-06-27 22:01:57 -07:00
Fan Zhang
192cc156b0 Delete obsolete activity alias for dev settings am: 0e1393ae8c
am: afbdbeb7d5

Change-Id: I0bbd3a65b7f1ab11e0f182ca4421c8c5911e6ad2
2018-06-27 21:56:41 -07:00
Fan Zhang
afbdbeb7d5 Delete obsolete activity alias for dev settings
am: 0e1393ae8c

Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4
2018-06-27 21:53:33 -07:00
Peiyong Lin
9b32ed2585 Merge "Rename Automatic color to Adaptive color" into pi-dev
am: f32310a7e6

Change-Id: I58c8322796905bc7ed589c3153c9de65598f268f
2018-06-22 14:13:22 -07:00
Peiyong Lin
f32310a7e6 Merge "Rename Automatic color to Adaptive color" into pi-dev 2018-06-22 21:08:37 +00:00
Chia-I Wu
7ccb3bb4df Rename Automatic color to Adaptive color
Rename the new mode (only available on 2018 devices) from Automatic to Adaptive.


Bug: 110524699
Test: manual
Change-Id: I56e87ad11a94915155cff56a6a13a9e167383e0c
2018-06-22 18:57:40 +00: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
Bill Yi
626972bada [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: e5c1ff17ac  -s ours

Change-Id: If83968942476f9a142aa11b04f3437e52066ec88
2018-06-21 12:35:46 -07:00
TreeHugger Robot
e5c1ff17ac Merge "Import translations. DO NOT MERGE" into pi-dev 2018-06-21 19:26:04 +00:00
Bill Yi
47baa07ba6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ieb6af16365681984ceafb048d338d8132df0e3bc
2018-06-21 11:31:13 -07: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
Treehugger Robot
23482a54bb Merge "Show Wifi 'Off' status properly just after boot" 2018-06-19 21:55:17 +00: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
5b255c9cbc [automerger skipped] Merge "Remove internal ApnSetting." am: 4079677883
am: 1fc6859126  -s ours

Change-Id: Ic6772c2b65d98c78863c5e9b60e7c1ac1cc714cb
2018-06-13 16:19:25 -07:00
Pengquan Meng
1fc6859126 Merge "Remove internal ApnSetting."
am: 4079677883

Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
2018-06-13 15:33:56 -07:00
Pengquan Meng
4079677883 Merge "Remove internal ApnSetting." 2018-06-13 20:47:13 +00: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
Ivan Chiang
d718f4bb8b Merge "Fix gray out previously connected device preference issue" into pi-dev
am: 2ffa711cd1

Change-Id: Id889619b77d10826ad0c0eefe494b7aea3a4d779
2018-06-12 01:20:56 -07:00
TreeHugger Robot
2ffa711cd1 Merge "Fix gray out previously connected device preference issue" into pi-dev 2018-06-12 07:34:15 +00:00
android-build-team Robot
fa06be0727 Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360, 4317665, 4317701, 4315391, 4316085] into pi-release
Change-Id: I913d48556bf01f9baf0b1e2d6dfc41127a9816d1
2018-06-12 01:49:25 +00:00
Fan Zhang
23059f5e5a Skip device index job if caller is not Settings app.
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Fixes: 109713077
Test: robotests
(cherry picked from commit 74ba1a51d7)
(cherry picked from commit 9ecf3e0c11)
2018-06-12 01:48:58 +00:00
Fan Zhang
251c324646 Skip device index job if caller is not Settings app.
am: 9ecf3e0c11

Change-Id: I84974379ac3074367623cce60d6633fd4390ed00
2018-06-11 11:40:07 -07:00
Fan Zhang
9ecf3e0c11 Skip device index job if caller is not Settings app.
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Fixes: 109713077
Test: robotests
(cherry picked from commit 74ba1a51d7)
2018-06-11 15:54:36 +00:00