Commit Graph

27869 Commits

Author SHA1 Message Date
Alex Lin
d4420d4ce4 [DO NOT MERGE] Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested

Change-Id: Ic03abd0d2706b7bb9fdc56be7906411b731b186b
2019-12-11 00:15:48 +00:00
Rahul Sabnis
9348f31126 Remove calls to APIs no longer being supported
Bug: 143245666
Test: Manual
Change-Id: Ibec2c9d60ec5c90e9e4f0a03b75c54164f50f42d
2019-12-09 16:08:29 -08:00
Arc Wang
be02f16b3a [Wi-Fi] Fix transition mode problems
Replace SECURITY_PSK_SAE_TRANSITION & SECURITY_OWE_TRANSITION with
AccessPpoint#isPskSaeTransitionMode() &
AccessPpoint#isPskOweTransitionMode()

Bug: 144320676
Bug: 144320649
Bug: 144325162
Bug: 144321574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I6596c48ea54adcaf579682634965c379c7938895
Merged-In: Ic3c7ac1238a51b6e215ed63761720d2bc371d012
2019-12-09 19:20:55 +08:00
Mill Chen
a545a85f9d Prevent accounts page directly opening in screen pinning mode
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab35)
2019-12-09 03:18:24 +00:00
Automerger Merge Worker
39f1a86a3a Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev am: 95820eb001
Change-Id: I4937675c9088f53e1c6f82a55c6422f699f5ce36
2019-12-06 02:10:43 +00:00
Ilya Matyukhin
95820eb001 Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev 2019-12-06 01:58:55 +00:00
Automerger Merge Worker
835fa1fd59 Battery icon is too large am: b6b29c1af0
Change-Id: I799cccf2808289b8f080cfa339b3bb35bef2690a
2019-12-06 01:21:24 +00:00
TreeHugger Robot
c08f70b7dd Merge changes from topic "update_battery_icon" into qt-qpr1-dev
* changes:
  Sync dimen from SystemUI
  Battery icon is too large
2019-12-06 01:05:30 +00:00
Sarah Chin
00649c664e Merge "Add NGRAN" am: 4ff75ef786
am: 48388d0949

Change-Id: I131d35236c4fab49ea1a407479b7d75718399c62
2019-12-05 13:56:01 -08:00
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Neil Fuller
5f1c405f30 Merge "Switch settings to use TimeDetector" am: 5da6521458
am: 72ed7e8f64

Change-Id: Ia2f12a24835f83136c9400641992348b69f40270
2019-12-05 09:15:16 -08:00
Neil Fuller
5da6521458 Merge "Switch settings to use TimeDetector" 2019-12-05 17:05:05 +00:00
Ilya Matyukhin
1de3feb026 Fix "Skip lock screen" not working for secondary user
Bug: 140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
(cherry picked from commit e17caeea3f)
2019-12-05 04:11:49 +00:00
Automerger Merge Worker
3ebabb50f3 Merge "Always use local timezone for parsing date" into qt-qpr1-dev am: 1284d9de67
Change-Id: I949816a65e74fb6b9772906146684db8e4eb1dcd
2019-12-05 03:04:44 +00:00
TreeHugger Robot
1284d9de67 Merge "Always use local timezone for parsing date" into qt-qpr1-dev 2019-12-05 02:49:13 +00:00
Sarah Chin
bf7ee4a861 Add NGRAN
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
Merged-In: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
2019-12-04 09:16:04 -08:00
Neil Fuller
df086ecb4f Switch settings to use TimeDetector
Switch settings to use TimeZoneDetector when setting the system time
zone rather than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests
Change-Id: I6042093294ba9690d4355bfe1c47d9f88a2b7ac6
2019-12-04 13:43:58 +00:00
Jay Aliomer
5fb68ae95d Battery saver mode should disable dark mode modification
am: f4bc80c45c

Change-Id: Iff4cb52ba46e20bd012f95e9d29917f7952b4259
2019-12-03 09:47:41 -08:00
Tsung-Mao Fang
be895aea4c Always use local timezone for parsing date
Use local time zone to be in line with entry
in phonesky mainline module.

Test: Rebuild
Bug: 143357811
Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0
2019-12-03 09:06:59 +00:00
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
2019-12-02 18:19:52 +00:00
Bonian Chen
6c1861b3c0 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784
am: 944689abd6

Change-Id: I6bfa2099cdb382109c90f0c3b9ea76a2a7df4d19
2019-11-28 07:28:07 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources"
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
Bonian Chen
9c2c1b4784 Merge "Consider subId when loading Wfc string resources" 2019-11-28 15:22:21 +00:00
Neil Fuller
3296857f38 Merge "Switch settings to use TimeDetector" am: d32eee26e3
am: 5ef64ad89b

Change-Id: I8901a6595677380013cc3d063426a4dfead18b97
2019-11-28 00:59:44 -08:00
Neil Fuller
5ef64ad89b Merge "Switch settings to use TimeDetector"
am: d32eee26e3

Change-Id: I1f3c05b986768be9c29043eea51143d6ab22bd12
2019-11-28 00:54:40 -08:00
Neil Fuller
d32eee26e3 Merge "Switch settings to use TimeDetector" 2019-11-28 08:47:32 +00:00
Neil Fuller
3c794261a5 Switch settings to use TimeDetector
Switch settings to use TimeDetector when setting the system clock rather
than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=TimePreferenceControllerTest
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=DatePreferenceControllerTest
Change-Id: I671bf0e7e7364f64f1397d524c6277591eb4e22e
Merged-In: I671bf0e7e7364f64f1397d524c6277591eb4e22e
(cherry picked from commit 9861696306)
2019-11-27 16:36:59 +00:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
2019-11-27 14:35:07 +01:00
Bonian Chen
b61f54519b Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434
am: 37e02742a4

Change-Id: I81eac0ecd2948e7b5bd6b92ae90b349ab46675e7
2019-11-26 17:49:06 -08:00
Bonian Chen
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call."
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
2019-11-26 17:46:38 -08:00
Bonian Chen
262b4f7434 Merge "IMS: Grey out Wifi calling option when either sub is having call." 2019-11-27 01:35:23 +00:00
Bonian Chen
42eec15834 Merge "[Setting] Fix merge conflict" am: 67805d8e5e
am: ec4e1a14e0

Change-Id: I716436a78316eb111fa53bb6834d81934f7830f1
2019-11-26 02:11:19 -08:00
Bonian Chen
ec4e1a14e0 Merge "[Setting] Fix merge conflict"
am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8
2019-11-26 02:02:03 -08:00
Bonian Chen
67805d8e5e Merge "[Setting] Fix merge conflict" 2019-11-26 08:45:05 +00:00
Raff Tsai
14990a1901 Merge "Prevent null point exception" am: 45b03edd00
am: bfa1f2979e

Change-Id: Ib0afc6d71113b52fc63caf5b960ca7239a5c364c
2019-11-26 00:04:15 -08:00
Raff Tsai
bfa1f2979e Merge "Prevent null point exception"
am: 45b03edd00

Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112
2019-11-26 00:02:27 -08:00
Bonian Chen
dfba6f8720 [Setting] Fix merge conflict
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-26 07:20:30 +00:00
timhypeng
b6b29c1af0 Battery icon is too large
-sync layout from SystemUI

Bug: 141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
(cherry picked from commit c71f996da9)
Merged-In: I5e165e953682fcfdebf0d06475bb1abd171684d9
2019-11-26 12:35:22 +08:00
Raff Tsai
0e8a45a7f5 Prevent null point exception
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
2019-11-26 12:05:58 +08:00
Bonian Chen
8efd95c413 Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099
am: d7f0fb6cc1

Change-Id: Ic6268671ff092174866dbd6341a9d7113bd2a4bd
2019-11-25 05:53:45 -08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call"
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
2019-11-25 05:43:18 -08:00
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call.
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
2019-11-25 12:10:03 +05:30
Jay Aliomer
c2302a3d93 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
am: 26ce6885c9

Change-Id: If216838715772b9d45624e77213ec81f0c84bd60
2019-11-22 14:42:52 -08:00
Jay Aliomer
53ad4fedc6 Revert "Revert "Add settings for scheduling dark theme""
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
2019-11-22 20:58:23 +00:00
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-22 20:38:13 +00:00
Andrei-Valentin Onea
555425a990 Merge "Add compatibility change preference" am: 0e7b8f7a93
am: 5f2ee93a4b

Change-Id: I04714e52df6c5e967af744d584f5d2db38cb5680
2019-11-22 06:12:52 -08:00
Andrei-Valentin Onea
5f2ee93a4b Merge "Add compatibility change preference"
am: 0e7b8f7a93

Change-Id: Ied50da0e1cdda7c390603f184ae614dd8584025b
2019-11-22 06:06:39 -08:00
Andrei-Valentin Onea
0e7b8f7a93 Merge "Add compatibility change preference" 2019-11-22 13:02:45 +00:00
Hai Shalom
59185d0931 Merge "Revert submission" into qt-qpr1-dev
am: 775106e40d

Change-Id: I90ea8783da54caf1f3e140b7eb768129d8332f61
2019-11-21 19:57:51 -08:00
Hai Shalom
775106e40d Merge "Revert submission" into qt-qpr1-dev 2019-11-22 03:46:02 +00:00