Commit Graph

4739 Commits

Author SHA1 Message Date
Neil Fuller
17f04b66b2 Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Merged-In: I920411dfa7e000a0da9678826a035e0461211619
Change-Id: I920411dfa7e000a0da9678826a035e0461211619
(cherry picked from commit 1e1961a5b3)
2018-11-22 10:05:12 +00:00
Maurice Lam
3cf13adf9b Remove ShadowLibcoreTimeZoneNames
Bug: 119829838
Test: Treehugger

(cherry picked from commit cc2cf5ba5a)

Change-Id: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
Merged-In: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
2018-11-21 11:07:11 +00:00
Treehugger Robot
8f516adef7 Merge "Allow StubVolume to be browseable in Settings" 2018-11-13 19:20:38 +00:00
Victor Chang
fe627a5901 Remove the feature flag and dead code for the old time zone picker
This commit backports commit 6be6c58206
to aosp/master.

Bug: 72376227
Test: build only
Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
(cherry picked from commit 6be6c58206)
2018-11-13 07:49:32 +00:00
Risan
9deece9086 Allow StubVolume to be browseable in Settings
Test: Unit test + manual test: Mount and unmount stubvolume in ARC++,
check settings show the device correctly and could browse it using
DocumentsUI.
Bug: 110380403

Change-Id: I96fc82e731225776ac7070ef035687f83da94245
2018-11-08 21:47:22 +00:00
Bill Yi
8b16aba0dd Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
2018-10-24 14:47:27 -07:00
Stanley Tng
81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-17 18:14:27 +00:00
Treehugger Robot
b0e99e1472 Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +00:00
Stanley Tng
a8af2d3664 resolve merge conflicts of 019a771d2d to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
Stanley Tng
a6c927b51a Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-15 22:51:02 +00:00
Stanley Tng
a4fc23140a 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 068c2547f6)
2018-10-13 16:21:15 -07:00
Leon Liao
09385137e3 Merge "Rename isConnectable()"
am: ec65174f11

Change-Id: Ibfc536ba78a118bc33890e52efa6650b21bff62e
2018-09-26 05:59:20 -07:00
Leon Liao
ec65174f11 Merge "Rename isConnectable()" 2018-09-25 23:06:20 +00:00
Lei Yu
dbc26b576c Merge "Fix incorrect API invoke for BT profiles"
am: 625c1eeaa9

Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f
2018-09-21 13:13:39 -07:00
jackqdyulei
c7a83b2552 Fix incorrect API invoke for BT profiles
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()

Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Merged-In: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes: 113625278
Test: RunSettingsRoboTests
2018-09-20 12:38:26 -07:00
Leon Liao
6786e32a73 Rename isConnectable()
LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.

Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug: 79982487
Test: atest tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
2018-09-20 09:23:30 +08:00
Fan Zhang
2e2e1e243d Merge "Fix a crash when launching app detail for bad package name"
am: ada1a39ffb

Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
2018-09-11 18:28:08 -07:00
Fan Zhang
13d2551156 Fix a crash when launching app detail for bad package name
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes: 78779901
Test: robotests
2018-09-11 15:12:16 -07:00
Fan Zhang
18eecb1e67 Add config to disable app tray preview in display size.
Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 19:01:35 -07:00
Fan Zhang
de117046ad DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
Aurimas Liutikas
03fcde338b Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
2018-08-28 16:35:52 -07:00
Treehugger Robot
6e2db2c34b Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" 2018-08-28 21:54:01 +00:00
hjchangliao
bc7b20b419 DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager

Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsRoboTests

Remove OverlayManagerWrapper class out from Settings

Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6
2018-08-28 13:38:21 -07:00
Fan Zhang
07e55d97ca DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates

- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings

The task affinity is messing with the back stack for this activity when
launched externally

Fixes: 80281932
Fixes: 80290571
Test: manual

Disable uninstall update option for secondary users.

Fixes: 110249550
Test: manual

Suppress some gesture search when there is no hardware

Fixes: 110250839
Test: robotests

Check wifi password length by byte, not char.

Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes: 79209073
Test: robotest
2018-08-28 12:17:03 -07:00
Aurimas Liutikas
b1af85d155 Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
2018-08-28 11:48:56 -07:00
Doris Ling
51a72d4c38 Merge "Fix crash in clicking Default Home gear icon."
am: 0c724f5181

Change-Id: I53b6c18077d0bcf5a7bc13fcc425c6c1ca4143ad
2018-08-25 23:12:24 -07:00
Doris Ling
72836a99d2 Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.

Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Merged-In: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes: 112249115
Test: make RunSettingsRoboTests
2018-08-24 15:56:38 -07:00
Doris Ling
af4c772b30 Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
(cherry picked from commit 770f4abf9d)
2018-08-16 16:40:13 +00:00
Xiangyu/Malcolm Chen
188272e12b Merge "Use new SubscriptionInfo constructor"
am: e8e24e7e0b

Change-Id: I1e51d7951cc3594685c9dd2e0b4c0e2aedb3e84f
2018-08-14 13:59:07 -07:00
Malcolm Chen
b9a6c65a65 Use new SubscriptionInfo constructor
Bug: 92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
2018-08-13 20:26:38 -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
Pavel Grafov
0844fb92d8 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
(cherry picked from commit f14de789f4)
2018-07-17 23:28:34 +00:00
Lei Yu
1582ec3db7 Unrestrict app if it been set as device admin app
Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
(cherry picked from commit f87897b84c)
2018-07-17 23:28:31 +00:00
Hall Liu
f0072b7345 Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc

Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac)
2018-07-13 10:13:46 -07:00
Hall Liu
1b3985010d Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc

Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac)
2018-07-13 00:24:39 +00:00
TreeHugger Robot
4804c2c7a5 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev 2018-07-10 19:33:29 +00: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
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
TreeHugger Robot
ea97a66383 Merge "Conditionally block battery percantage from search" into pi-dev 2018-07-03 21:35:32 +00: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
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
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
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
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
TreeHugger Robot
2ffa711cd1 Merge "Fix gray out previously connected device preference issue" into pi-dev 2018-06-12 07:34:15 +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