Commit Graph

47034 Commits

Author SHA1 Message Date
Shuzhen Wang
6cd426482e Revert "Settings: Add logical camera default switch"
This reverts commit 5aab8d9ee1.

Reason for revert: This setting is for internal QC purpose only
Bug: 80007047

Change-Id: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
2018-05-31 22:29:29 +00:00
TreeHugger Robot
2760369d4f Merge "Added keyword 'bug' to Send Device Feedback" 2018-05-31 21:35:15 +00:00
Beverly
1aa6826e80 Fix null pointer in StarredContactsPrefController
Change-Id: I9b2209825b30a6cc8dfe355632201b8082572dbb
Fixes: 80084826
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-05-31 17:29:08 -04:00
Beverly
60d57976bc Merge "No need for "and" - ListFormatter adds it" into pi-dev
am: fa01fcb2c9

Change-Id: If899d486356937f740a959f1ca6d94b8675d857a
2018-05-31 14:24:11 -07:00
Antony Sargent
9ceb587ede Don't crash on null Intent in FingerprintEnrollFindSensor
During a run of the setup wizard, a tester one time encountered a case
where the 'Accept Legal terms' screen followed by the Security screen
showed for a second time after already confirming the pattern in the
Security screen. The logs showed a crash in
FingerprintEnrollFindSensor.onActivityResult which could only have
happened if it was called with a requestCode of CONFIRM_REQUEST and a
resultCode of RESULT_OK, but a null Intent.

This isn't an expected flow, and AFAIK we haven't been able to reproduce
the original problem, but it seems reasonable to at least not crash in
settings, so this CL defends against that crash by just calling finish()
in this case, which means the caller who started the
FingerprintEnrollFindSensor will see the default result code of
Activity.RESULT_CANCELLED.

Bug: 80099085
Test: make -j RunSettingsRoboTests
Change-Id: I94401eabe295e4d5396cf7d324fbf1902dc45f6d
2018-05-31 14:22:38 -07:00
Matthew Fritze
2c7fe6f8ea Merge "Make Settings Slider Slices one row" into pi-dev
am: 4199198ec2

Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc
2018-05-31 11:37:19 -07:00
TreeHugger Robot
fa01fcb2c9 Merge "No need for "and" - ListFormatter adds it" into pi-dev 2018-05-31 18:12:00 +00:00
Josh Hou
606222da7f Add Slices for Enhanced 4G LTE
Add Slices for Enhanced 4G LTE
Enhanced 4G LTE Slice Provider:
Create slice to display appropriate message with further instructions
Enhanced 4G LTE Slice Broadcast Reciver:
1. Change the setting via ImsManager
2. Ask to requery the slice in one second to display updated settings if 1 is valid or display appropriate message

Bug: 79270171
Test: Robotests
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I48d412de94d5d9f1ad42a299691ec5cf8001c6a1
2018-05-31 10:34:00 -07:00
TreeHugger Robot
4199198ec2 Merge "Make Settings Slider Slices one row" into pi-dev 2018-05-31 16:03:25 +00:00
Beverly
ab5a016e26 No need for "and" - ListFormatter adds it
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
2018-05-31 09:32:26 -04:00
Chalard Jean
2583a7bffc Use the SSID of the network in the no internet dialog
Bug: 77865258
Test: manual & roboelectric
Change-Id: I72f1f74bf004f30a2c38b4c3af977ff09360d1e8
2018-05-31 16:51:38 +09:00
TreeHugger Robot
e68598380e Merge "Shown toast when BT turned on" 2018-05-31 07:00:27 +00:00
ryanywlin
d67314e771 Handle Bluetooth is not supported on emulator
- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor

Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42

Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e
2018-05-31 12:48:13 +08:00
Weien Wang
31f17d88d0 Merge "Fix the battery icon on the battery page when low battery" 2018-05-31 04:37:05 +00:00
hughchen
3051845840 Shown toast when BT turned on
* Shown "Bluetooth turned on" toast only when BT turned on in "Pair new device"
* Add test to verify shown toast function can be called when BT turned on.

Bug: 79383997
Test: make -j42 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDetailTest
Change-Id: I25f75aaa04063d9ef8a0df4bb06aeaa70d7ac146
2018-05-31 11:03:37 +08:00
TreeHugger Robot
d3fede04a8 Merge "Add strings for multiple user footer" 2018-05-30 23:53:34 +00:00
TreeHugger Robot
32f70ecd95 Merge "Use settingslib shadows in Settings robotest" 2018-05-30 23:00:20 +00:00
Matthew Fritze
93307cdb69 Make Settings Slider Slices one row
To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.

Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests
2018-05-30 15:39:43 -07:00
Fan Zhang
fb6f95fb99 Add strings for multiple user footer
Bug: 72319180
Test: rebuild
Change-Id: If12ff75555aa362c8663dc19ca6ba4d99a7c8a47
2018-05-30 15:38:26 -07:00
TreeHugger Robot
ae20b1ef0c Merge "Added new keywords to adaptive brightness results." 2018-05-30 22:35:38 +00:00
Fan Zhang
6fc7ebd72b Use settingslib shadows in Settings robotest
Change-Id: Ieae5d65bb5efdbc4c91455d1f722e84fe9e60116
Fixes: 80428049
Test: robotest
2018-05-30 14:36:26 -07:00
Michael
6097fe9c3e Added new keywords to adaptive brightness results.
Added two new strings to the string resource. Added smart brightness and
dyanmic brightness.

Fixes: 80481385
Test: UI change
Change-Id: Iafde3501d41cac13d5f6da16e4575518c8e7ffa9
2018-05-30 14:26:40 -07:00
Andre Garivay
81bb3cfbf4 Added keyword 'bug' to Send Device Feedback
Added string resource for keywords

Change-Id: I174a401bab93672a2260cf342c6bf52c311383d3
Fixes: 80419062
Test: UI change
2018-05-30 14:26:16 -07:00
Hansong Zhang
f1dc08a608 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours am: acfbc0eff4
am: 6197f671b2  -s ours

Change-Id: Ib3ccb0ba92d443b4cd85f4f93c24292bf3efaace
2018-05-30 14:11:13 -07:00
Hansong Zhang
6197f671b2 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours
am: acfbc0eff4

Change-Id: If3486b74a7b37cf12637aabeeece719c9567093a
2018-05-30 13:59:15 -07:00
Hansong Zhang
acfbc0eff4 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14
am: 7cc441bf2f  -s ours

Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6
2018-05-30 13:41:41 -07:00
Hansong Zhang
7cc441bf2f DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d
am: 48aa959b14

Change-Id: I13480b0bf786ddd05959cb597492041e273d920c
2018-05-30 13:32:52 -07:00
TreeHugger Robot
2c032fdd19 Merge "Stop using AppState for app icon in DomainAppPreference." 2018-05-30 20:31:54 +00:00
Hansong Zhang
48aa959b14 DO NOT MERGE Give PBAP permission only after user confirms
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d
2018-05-30 13:23:53 -07:00
TreeHugger Robot
ad90960b6e Merge "delete DeviceInfoSettings and activity, pref xml" 2018-05-30 20:14:50 +00:00
Fan Zhang
179f537173 Stop using AppState for app icon in DomainAppPreference.
Change-Id: I080ed9d2d7d70c092bec54ed4e4b6bb2b6c8f453
Fixes: 77967533
Test: robotest
2018-05-30 12:33:26 -07:00
TreeHugger Robot
50437769a2 Merge "Skip device index job if caller is not Settings app." 2018-05-30 18:40:21 +00:00
Hansong Zhang
aaf637ff5f Merge "Give PBAP permission only after user confirms" into pi-dev am: fcac34d723
am: cd09ff50bb

Change-Id: I404d323a39dc7a42f20c3411aebb2237c1fb13f3
2018-05-30 10:46:36 -07:00
Hansong Zhang
cd09ff50bb Merge "Give PBAP permission only after user confirms" into pi-dev
am: fcac34d723

Change-Id: I96b3a2f59ff77d646c641043428db673eaaf2653
2018-05-30 10:41:35 -07:00
Fan Zhang
74ba1a51d7 Skip device index job if caller is not Settings app.
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Test: robotests
2018-05-30 10:38:58 -07:00
TreeHugger Robot
fcac34d723 Merge "Give PBAP permission only after user confirms" into pi-dev 2018-05-30 17:35:57 +00:00
Fan Zhang
09df7d7071 [automerger skipped] Merge "Plumb context object to PowerWhitelistBackend." into pi-dev am: cf2e1fd593
am: 4a337db847  -s ours

Change-Id: Ie0b54bf4af9e77cd811f2979e97af9a973a828ae
2018-05-29 20:45:22 -07:00
Fan Zhang
4a337db847 Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
am: cf2e1fd593

Change-Id: I7d3b2321d9cc3c44dea3738596104df2e43cb1f3
2018-05-29 20:20:55 -07:00
TreeHugger Robot
cf2e1fd593 Merge "Plumb context object to PowerWhitelistBackend." into pi-dev 2018-05-30 03:08:20 +00:00
Ivan Chiang
c6d7191cb9 Fix gray out previously connected device preference issue
Count the dock devices in previously connected device controller.

Change-Id: I08d82ec715698ecf894a4a7cd0631c5f1de0f591
Fix: 80227045
Test: m -j SettingsRoboTests RunSettingsRoboTests
2018-05-30 02:45:47 +00:00
Fan Zhang
70af6d884c [automerger skipped] Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev am: ce7d1ab3bb
am: 85d843f72d  -s ours

Change-Id: Ieb58d9b8ef64af319e433e36a2d9a20acab002fa
2018-05-29 19:07:20 -07:00
TreeHugger Robot
6e06da361a Merge "Plumb context object to PowerWhitelistBackend." 2018-05-30 01:50:40 +00:00
Fan Zhang
85d843f72d Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
am: ce7d1ab3bb

Change-Id: I57a3b66ba8b4c84b7407ada5e1d754b49d85e61a
2018-05-29 18:01:02 -07:00
TreeHugger Robot
3a05544d34 Merge "Misc fixes for Settings" 2018-05-30 00:26:48 +00:00
TreeHugger Robot
ce7d1ab3bb Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev 2018-05-30 00:18:45 +00:00
Fan Zhang
3489f65024 Plumb context object to PowerWhitelistBackend.
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:33:01 +00:00
Fan Zhang
7e395e1a00 Plumb context object to PowerWhitelistBackend.
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:32:22 +00:00
Fan Zhang
9ab2f37226 Prevent disabling default phone/sms apps in battery setting
- In handleDisableable(), call getKeepEnabledPackages() in the same way
  as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
  app packages.

Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Merged-In: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Fixes: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:25:56 +00:00
Fan Zhang
b70b11e02b Prevent disabling default phone/sms apps in battery setting
- In handleDisableable(), call getKeepEnabledPackages() in the same way
  as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
  app packages.

Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Bug: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:21:24 +00:00
Hansong Zhang
500c83c1bc Give PBAP permission only after user confirms
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
2018-05-29 22:15:51 +00:00