Commit Graph

9885 Commits

Author SHA1 Message Date
Alan Stokes
121eaa7d3e Cleanup background activity starts for release.
This removes the parts of the feature that were only needed in beta
releases:
- Develper setting to force feature on or off.

Not to be submitted until after beta 5 is cut.

Bug: 131747138
Test: Still builds, developer settings still works.

Change-Id: I573761174317797aeb4df97cf1a2b1ce005c0715
2019-05-28 09:31:12 +01:00
Raff Tsai
7cdf4de682 Merge "Fix failed test case" into qt-dev am: fb28f92f71 am: a611241c64
am: fe0f6e3908

Change-Id: Ie7326c44004d47fe21453f3da442a9d53ca7bae4
2019-05-27 11:05:29 -07:00
Raff Tsai
a611241c64 Merge "Fix failed test case" into qt-dev
am: fb28f92f71

Change-Id: I4966ba309e2aeba0d1b243b28401c9b272a31e44
2019-05-27 09:47:31 -07:00
Raff Tsai
83df51ebf3 Fix failed test case
Fixes: 133629032
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core"
Change-Id: I4baf0582a528e3601ca132c15e5078bc0159a352
2019-05-27 09:33:02 +08:00
Arc Wang
82eee0632b Merge changes from topic "refine ConfigureWifiSettings"
* changes:
  Refactor NotifyOpenNetworksPreferenceControllerTest into TogglePreferenceController
  Refactor UseOpenWifiPreferenceController into TogglePreferenceController
  Refactor WifiWakeupPreferenceController into TogglePreferenceController
2019-05-25 14:04:35 +00:00
Yi Jiang
c99e853a1b Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d am: a4b9203139
am: 648ded3601

Change-Id: I761597ffe33fb5619b18e689028cfc299f3e132a
2019-05-24 21:47:12 -07:00
Yi Jiang
648ded3601 Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d
am: a4b9203139

Change-Id: I012fb4827d7fa6b4ed25ec76a520fddb58b8b5ee
2019-05-24 21:11:17 -07:00
Yi Jiang
43f82bd3c4 Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev
am: 79abf23f4d

Change-Id: I86d9e64d6d7afeb56e588c70068d1192bd52a1e2
2019-05-24 20:04:30 -07:00
Evan Laird
623cc03e11 Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff am: a433064df4
am: 22a6050035

Change-Id: I774539d62c337b7ec76ea74136c91f6da03124d6
2019-05-24 19:02:25 -07:00
Yi Jiang
79abf23f4d Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev 2019-05-25 01:20:28 +00:00
Arc Wang
cc75d0e2d9 Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 3e39f94880
am: 842b421420

Change-Id: I1dba808a58d55e72259a048d6cb760fe286df054
2019-05-24 16:51:24 -07:00
Yi Jiang
6da0447068 Fix unexpected grey-out in Screen attention
Fix preference controller searchable issue.

Bug: 132821023
Bug: 133255690
Test: atest AdaptiveSleepPreferenceControllerTest
Change-Id: I686ed827fbe572c9d8bcde2d8a8e00f2dcb5a6a8
2019-05-24 16:50:18 -07:00
Lei Yu
73039e0cbc Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 am: 52c51fd26f
am: b46410688f

Change-Id: If4638ce9bf53d839bb5c489a740372a538a41ca3
2019-05-24 16:42:23 -07:00
Mady Mellor
1fa11a8c37 Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2 am: 4740a76fd4
am: 34c7eac424

Change-Id: I64398601c3d1f37a124c04f4e042a34ae1c45673
2019-05-24 16:36:57 -07:00
Evan Laird
a433064df4 Merge "Simplify channel importance settings screen" into qt-dev
am: 4321e038ff

Change-Id: I9346139116adef62b83e1e85030c8371fa936375
2019-05-24 10:13:47 -07:00
TreeHugger Robot
4321e038ff Merge "Simplify channel importance settings screen" into qt-dev 2019-05-24 16:36:49 +00:00
Alan Stokes
81ddb45922 Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d am: 5b1b45b498
am: 9a17e6265a

Change-Id: I24459012f6a6a0b4e3265d36423bed9cafa20d3e
2019-05-24 06:50:21 -07:00
Stanley Wang
69f6d559b0 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 69893f95ae
am: 09dbc29187

Change-Id: I94a03587188d833536b13627776ba9c44af77492
2019-05-24 06:48:04 -07:00
Lei Yu
f945851e79 Merge "Update logic to build slider slice" into qt-dev am: 8866301b83 am: 1131a1e0d7
am: fc58ee09fb

Change-Id: I5f9cafd727000d9e9042aa2075ad05b235d33aff
2019-05-24 06:44:06 -07:00
Julia Reynolds
642f5aeee8 Merge "Config notifs page updates" into qt-dev am: 1c83c08289 am: 4679c46a8a
am: 7528ab396e

Change-Id: Iecf21ae784fcf82b31a7ccbf4fe52e8950709996
2019-05-24 06:38:22 -07:00
Evan Laird
472e19eae4 Simplify channel importance settings screen
Back to bell icons, and removed the flavor text

Test: visual
Bug: 132971502
Change-Id: I55ce6dd07404aed2ceb5423796b733a70c3bfa13
2019-05-24 09:08:14 -04:00
Arc Wang
842b421420 Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c
am: 3e39f94880

Change-Id: I53350e526743e3fb4597eabe04af9ec54f74a0e2
2019-05-23 23:15:05 -07:00
Yiwen Chen
2dd7a569bb Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a
am: 7176ddc247

Change-Id: Ib04c4b59431a55a445167bcb8aa7de9812d03d21
2019-05-23 22:57:19 -07:00
Arc Wang
55f4c5eb65 Merge "Fix Wi-Fi QR code decode fail" into qt-dev
am: 27d09aeb0c

Change-Id: I9345c2aa577871b3c3fc22ac6960708dac268f5c
2019-05-23 22:19:45 -07:00
Yiwen Chen
b11ec2c1a3 Merge "Keep consistency between sound and accessibility settings." into qt-dev
am: 6843e0247a

Change-Id: I8df347b5fba7b83de67f4bf71123cd64026b4587
2019-05-23 22:18:09 -07:00
Arc Wang
535e72a45b Refactor NotifyOpenNetworksPreferenceControllerTest into TogglePreferenceController
NotifyOpenNetworksPreferenceControllerTest is essentially reimplementing TogglePreferenceController.

Add below 2 changes for test failure of CodeInspectionTest

1. Remove some arguments from constructor of the controller
2. Declare the controller in xml instead of in code

Bug: 132391311
Test: manual
      NotifyOpenNetworksPreferenceControllerTestTest

Change-Id: Icda870ef0b90aacbacfe588b23d1b28d2b60941c
2019-05-24 12:17:32 +08:00
Arc Wang
912f3558df Refactor UseOpenWifiPreferenceController into TogglePreferenceController
UseOpenWifiPreferenceController is essentially reimplementing TogglePreferenceController.

Add below 2 changes for test failure of CodeInspectionTest

1. Remove some arguments from constructor of the controller
2. Declare the controller in xml instead of in code

Bug: 132391311
Test: manual
      UseOpenWifiPreferenceControllerTest

Change-Id: Ie52e79fd0bc66a227bd46f09c74d1fbec614f636
2019-05-24 12:09:20 +08:00
Arc Wang
1ee4adf321 Refactor WifiWakeupPreferenceController into TogglePreferenceController
WifiWakeupPreferenceController is essentially reimplementing TogglePreferenceController.

Add below 2 changes for test failure of CodeInspectionTest

1. Remove some arguments from constructor of the controller
2. Declare the controller in xml instead of in code

Bug: 132391311
Test: manual
      WifiWakeupPreferenceControllerTest

Change-Id: I4aa607f78d5e7de70600a410dfc7267e6bd7d387
2019-05-24 12:05:37 +08:00
Arc Wang
27d09aeb0c Merge "Fix Wi-Fi QR code decode fail" into qt-dev 2019-05-24 01:56:42 +00:00
Yiwen Chen
6843e0247a Merge "Keep consistency between sound and accessibility settings." into qt-dev 2019-05-24 01:24:52 +00:00
Yiwen Chen
85580fbc88 Keep consistency between sound and accessibility settings.
Bug: 130741987
Test: Tested on device
Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8
(cherry picked from commit 494071463b)
2019-05-24 01:24:35 +00:00
Lei Yu
b46410688f Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1
am: 52c51fd26f

Change-Id: I884be341b204703fcd11a4617bcfba5bdc248231
2019-05-23 15:49:16 -07:00
Lei Yu
a444fd99be Merge "Hide network select in some situations" into qt-dev
am: 2bdf358cd1

Change-Id: Ie188d11a05692d49e8fb154e348aa1789098a0c9
2019-05-23 13:59:54 -07:00
Lei Yu
2bdf358cd1 Merge "Hide network select in some situations" into qt-dev 2019-05-23 20:28:38 +00:00
Lei Yu
2bf8806740 Hide network select in some situations
Hide network select when:
1. NETWORK_MODE_LTE_CDMA_EVDO && worldMode
2. 6 NETWORK_MODE && worldMode && !Tdscdma

Also update GSM/CDMA check since it was only include 1 network mode,
not 6 modes.

Fixes: 131126607
Test: RunSettingsRoboTests
Change-Id: I28782778827ced7d9f24d527d52399e2b544109e
2019-05-23 09:56:28 -07:00
Mady Mellor
34c7eac424 Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2
am: 4740a76fd4

Change-Id: I1939a419fccc83943f4297595d1400378017ccba
2019-05-23 08:07:12 -07:00
Yiwen Chen
cbb6ea5ea4 Merge "Keep consistency between sound and accessibility settings." 2019-05-23 14:52:48 +00:00
Mady Mellor
f4845105b9 Merge "App Bubble control page should always be available, even if off globally" into qt-dev
am: f7f1dd37c2

Change-Id: Iae957998688392d32cfb693a32d02353ffa39bbd
2019-05-23 07:44:58 -07:00
Mady Mellor
f7f1dd37c2 Merge "App Bubble control page should always be available, even if off globally" into qt-dev 2019-05-23 13:58:19 +00:00
Arc Wang
0d706f0047 Fix Wi-Fi QR code decode fail
ZXing generate QR code with default encoding ISO-8859-1,
the generated QR code is wrong encoded if there is a
character outside of the charset.

Generate QR code of UTF-8 encoding.

Bug: 131851854
Test: manual
Change-Id: I96a5e72a978c654b62d89b3b11dd3016bf0ee1df
2019-05-23 20:41:45 +08:00
Alan Stokes
5b1b45b498 Merge "Background activity starts are now blocked by default." into qt-dev
am: 3178ea5f2d

Change-Id: I98a1e7b51f56acb15d4f7118bced2e20d8a7f152
2019-05-23 03:11:59 -07:00
TreeHugger Robot
3178ea5f2d Merge "Background activity starts are now blocked by default." into qt-dev 2019-05-23 09:43:27 +00:00
Stanley Wang
68ce56b016 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev
am: 3da9f727e3

Change-Id: I3b33d3cf0509d3c1091dfcfc39df00bbb1441933
2019-05-23 02:04:24 -07:00
Stanley Wang
09dbc29187 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3
am: 69893f95ae

Change-Id: Ib454a3aec4c5d3e6ca4de21973723ba667f8a857
2019-05-23 01:48:00 -07:00
Yiwen Chen
494071463b Keep consistency between sound and accessibility settings.
Bug: 130741987
Test: Tested on device
Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8
2019-05-23 00:13:01 -07:00
TreeHugger Robot
3da9f727e3 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev 2019-05-23 04:19:27 +00:00
Lei Yu
1131a1e0d7 Merge "Update logic to build slider slice" into qt-dev
am: 8866301b83

Change-Id: I8d50f937f42aa6110731eb529a4d468bb7344fdf
2019-05-22 21:10:11 -07:00
Antony Sargent
389e2a0a97 Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev am: e959c201ce am: ce8495d632
am: db9abe8dd8

Change-Id: Ibde17a1d7949d24b5861db8172a3313dda054c7b
2019-05-22 20:36:05 -07:00
TreeHugger Robot
8866301b83 Merge "Update logic to build slider slice" into qt-dev 2019-05-23 00:39:10 +00:00
Julia Reynolds
cba0b335c5 Merge "Fix hiding of channel fields" into qt-dev am: c14825c93d am: b1ec5751c1
am: 85a3096214

Change-Id: I0c5fc03a217e489cd1eec5022ecb42ace7390a0a
2019-05-22 16:31:19 -07:00