Commit Graph

52003 Commits

Author SHA1 Message Date
Fan Zhang
487efbf919 Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev am: 9fa82a370b
am: 7be1bcf26c

Change-Id: I9a79ea6ae11613bcf0a6789bdd552526f205ffe3
2019-04-25 00:31:22 -07:00
Antony Sargent
4b20393348 Merge "Implement off state for SIM details page" into qt-dev am: 62d580d5b4
am: d6209877b1

Change-Id: I3f7ae6636b367eba9a64c9166dc1c2712e749dff
2019-04-25 00:30:36 -07:00
Mill Chen
7c410b953a Merge "Update dialog background color for dark theme" into qt-dev am: 235387c4f1
am: 22a0a950f0

Change-Id: I6ef4764ca9801bb5efd7f87b92cc596570e4f28b
2019-04-25 00:20:57 -07:00
tmfang
948429e343 Merge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev am: ab3f4062d1
am: 6aa2c1a65f

Change-Id: If8f048c1ff3a8ab5a9a6e961b61a13841b8c02da
2019-04-25 00:20:03 -07:00
Julia Reynolds
75bd47106a Merge "String changes" into qt-dev am: 2f731500ad
am: 92cb6a4782

Change-Id: I042dafa45e087d9eaa5126039cffb0a3e089ed6a
2019-04-25 00:19:15 -07:00
Julia Reynolds
a35e3d9d88 Merge "Fix notification preferences" into qt-dev am: 42eefd0d7e
am: 953bb4514c

Change-Id: I7110af8c4e1e5c7b740faa6df4437dd6ceb2272a
2019-04-25 00:18:15 -07:00
Cating Lin
ba3c603323 Merge "The icon of suggestion_fingerprint should be blue." into qt-dev am: 08319ee328
am: 81183f3af6

Change-Id: Icda125e005293b76177e38c66e0d120bb91d5533
2019-04-25 00:16:40 -07:00
Fan Zhang
7be1bcf26c Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
am: 9fa82a370b

Change-Id: If9af81bfa4d99eee0b211b7216b3ca9d1baa66f2
2019-04-25 00:13:10 -07:00
Antony Sargent
d6209877b1 Merge "Implement off state for SIM details page" into qt-dev
am: 62d580d5b4

Change-Id: I37c513eb170667c6729b6a94a7788f24229dcf5a
2019-04-25 00:12:19 -07:00
Mill Chen
22a0a950f0 Merge "Update dialog background color for dark theme" into qt-dev
am: 235387c4f1

Change-Id: I3ee2f7e1c674efbc0caaa1a0ae36fe66f197f86e
2019-04-25 00:11:08 -07:00
tmfang
6aa2c1a65f Merge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev
am: ab3f4062d1

Change-Id: I6f7a0fcbc80770ce66eb82fbf9054ae818145435
2019-04-25 00:10:18 -07:00
Julia Reynolds
92cb6a4782 Merge "String changes" into qt-dev
am: 2f731500ad

Change-Id: Id5c5cc2c86211ee0e52394d9b3e35999486ee493
2019-04-25 00:09:27 -07:00
Julia Reynolds
953bb4514c Merge "Fix notification preferences" into qt-dev
am: 42eefd0d7e

Change-Id: I177e26feac7fd555e9e86c4bc730764a993e36bb
2019-04-25 00:08:26 -07:00
Cating Lin
81183f3af6 Merge "The icon of suggestion_fingerprint should be blue." into qt-dev
am: 08319ee328

Change-Id: Id9e6f2e512bff148287a78e93cfb0032316122f6
2019-04-25 00:07:39 -07:00
Ilya Matyukhin
e222e1885e Merge "Use auth token from intent extras" into qt-dev am: 172d03c758
am: 67459a21ff

Change-Id: I940af9acacf470b30c2225efa34cdcf35275c9b2
2019-04-24 23:56:37 -07:00
Ilya Matyukhin
67459a21ff Merge "Use auth token from intent extras" into qt-dev
am: 172d03c758

Change-Id: Ia410ae2ee581bd318f5d245e829b7d4a53af9b12
2019-04-24 23:44:06 -07:00
Fan Zhang
9fa82a370b Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev 2019-04-24 21:44:53 +00:00
TreeHugger Robot
62d580d5b4 Merge "Implement off state for SIM details page" into qt-dev 2019-04-24 21:00:38 +00:00
Lei Yu
d68c8c59e5 Fix settings unit test
Also remove some obsolete tests

Fixes: 126257657
Test: atest
Change-Id: Ib9b654b9076176db3c331bf5ca14ac185c9e0b5f
2019-04-24 20:40:59 +00:00
TreeHugger Robot
235387c4f1 Merge "Update dialog background color for dark theme" into qt-dev 2019-04-24 19:44:42 +00:00
TreeHugger Robot
ab3f4062d1 Merge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev 2019-04-24 18:09:37 +00:00
Antony Sargent
74d8d9c31f Implement off state for SIM details page
When a subscription is disabled, we need to hide most things on the
details page. The UX mocks called for leaving in a few things such as
the data usage header and some carrier information, but in tests I've
done it looks like the telephony APIs don't have any of that available
when the subscription is disabled. So for now the only thing left on the
page in the disabled case is the on/off toggle at the very top.

Fixes: 129665956
Test: make RunSettingsRoboTests
Change-Id: I98f4590fca38d03b1e5ff2cf0d2b4876d2adf936
2019-04-24 10:54:47 -07:00
Julia Reynolds
2f731500ad Merge "String changes" into qt-dev 2019-04-24 17:46:42 +00:00
Julia Reynolds
42eefd0d7e Merge "Fix notification preferences" into qt-dev 2019-04-24 17:46:28 +00:00
TreeHugger Robot
08319ee328 Merge "The icon of suggestion_fingerprint should be blue." into qt-dev 2019-04-24 17:45:42 +00:00
Ilya Matyukhin
172d03c758 Merge "Use auth token from intent extras" into qt-dev 2019-04-24 16:27:55 +00:00
andychou
6185e381e0 Fix incorrect mapping to get subscriptioninfo
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.

Bug: 131123246
Test: Test with dual SIM device and atest SimStatusDialogControllerTest
pass

Change-Id: If7140f602571a5cb8dcdfff939bd84ccff0b482f
2019-04-24 23:18:51 +08:00
Julia Reynolds
21959ca6de String changes
Bug: 123899489
Test: make
Change-Id: I4ff2fdd6e0ef467d8385dcf3b75ace48458b88ab
2019-04-24 11:13:22 -04:00
Julia Reynolds
e103aa8fd2 Fix notification preferences
- ImportancePreference should not be separately clickable
- new strings

Bug: 127796543
Fixes: 131060409
Test: make sure talkback doesn't read 'double tap to activate' when
the preference is focused

Change-Id: I6b6eef0915873b4e0b44c59758e5f4b5a265364b
2019-04-24 09:59:20 -04:00
tmfang
846f77ab81 Merge "Tweak search result for adaptive brightness" into qt-dev am: 4d03377901
am: 5cdafbc9ca

Change-Id: I26a132f195ae62e2f484cfdd936797f6e9fb4cd8
2019-04-24 01:21:42 -07:00
tmfang
5cdafbc9ca Merge "Tweak search result for adaptive brightness" into qt-dev
am: 4d03377901

Change-Id: Id63484b713666cecf041b3eafe20f8a0360102ad
2019-04-24 01:06:36 -07:00
Mill Chen
3032628269 Update dialog background color for dark theme
Fixes: 129993336
Test: visual
Change-Id: Ie04be80e9b2987a8f7af1c7ecd1628474486bcd0
2019-04-24 15:40:34 +08:00
Kevin Chyn
64d488595f Merge "Stay in face settings unless the user explicitly backs out" into qt-dev am: b70f2b58e0
am: 10e7e5d8d0

Change-Id: I3624db30a90f801b8b2f703afd5b53527cf5f8b7
2019-04-23 23:43:28 -07:00
TreeHugger Robot
4d03377901 Merge "Tweak search result for adaptive brightness" into qt-dev 2019-04-24 06:08:18 +00:00
hughchen
36ec99914a Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev am: 7a237a40d7
am: 9eec44bdb0

Change-Id: If3bd9e5cd537dec317268385827019b0834b7bce
2019-04-23 22:50:18 -07:00
Kevin Chyn
10e7e5d8d0 Merge "Stay in face settings unless the user explicitly backs out" into qt-dev
am: b70f2b58e0

Change-Id: I49ea46f8456ed4e418d942b3a059126c1962c685
2019-04-23 22:37:29 -07:00
Kevin Chyn
b70f2b58e0 Merge "Stay in face settings unless the user explicitly backs out" into qt-dev 2019-04-24 04:56:11 +00:00
Fan Zhang
142dc4e3f7 Merge "Fix a NPE when removing accounts." into qt-dev am: 0014cd721e
am: 67c8031f08

Change-Id: I94888acb6d87bf2130c67d175bfded85a5635ebe
2019-04-23 21:54:29 -07:00
tmfang
bf2989aaa4 Fix CTS issue on PRIVACY_SETTINGS
Fixes: 130696835
Test: Manually test as following stpes
1. Tap "BYOD Managed Provisioning" under "Managed Provisioning" section
2. Tap "START BYOD PROVISIONING FLOW"
3. Tap "Cross profile intent filters are set"
4. adb logcat -s 'android.settings.PRIVACY_SETTINGS'
        -> No error about android.settings.PRIVACY_SETTINGS

Change-Id: I8fa3b61f14ca2da577493643cda4d7d0c66b8b0b
2019-04-24 12:20:57 +08:00
Ilya Matyukhin
3be240fd8a Use auth token from intent extras
Bug: 124324349
Test: confirmation dialog doesn't show up when intent has auth token
Change-Id: I9e071b06e1041b0d3c78932d8cb2c16c4c32bca5
2019-04-23 20:53:31 -07:00
Kevin Chyn
d88289cd2c Merge "Update toggle layout and always show footer text" into qt-dev am: e7eba5d246
am: 8770f0866b

Change-Id: Ib159f6c9937aa37033d95f6e0b932f3f2c99ae4d
2019-04-23 20:23:24 -07:00
lindatseng
5c47099259 Merge "Fix robotests in settings/panel" into qt-dev am: 3225026ed6
am: 55c4916fb7

Change-Id: Ia01b885bb31631ebf62d85597e9a8e1358e686b8
2019-04-23 19:59:42 -07:00
hughchen
9eec44bdb0 Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev
am: 7a237a40d7

Change-Id: Iaea1651a7ba22f1731ee8ad991664b073c5233c3
2019-04-23 19:57:47 -07:00
Amin Shaikh
55169adcd5 Merge "Add overlayable_icons_test.xml for Settings." into qt-dev am: cd52cf18ce
am: e6f875f267

Change-Id: Ifbc0be8431eb463c8748e919bbfa6cd543ec9711
2019-04-23 19:48:14 -07:00
TreeHugger Robot
7a237a40d7 Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev 2019-04-24 02:45:09 +00:00
tmfang
e4753a3632 Tweak search result for adaptive brightness
- Create a new controller for auto brightness in
auto_brightness_detail.xml.
- We only show slice version for search result.
- Change slice summary for adaptive brightness.

Test: visual
Fixes: 130651278
Change-Id: If9b71735bbb2a0ee22676d9dfedab2cf9e778493
2019-04-24 10:04:38 +08:00
Fan Zhang
67c8031f08 Merge "Fix a NPE when removing accounts." into qt-dev
am: 0014cd721e

Change-Id: I7eb956631acac2f44040aca5c9ee325007f8e1f5
2019-04-23 19:03:19 -07:00
Fan Zhang
3e8626b6dc Merge "Test case clean up." into qt-dev am: c6bc40d397
am: 8243f6ae44

Change-Id: I70978d1fe98c7e4b04c068d5d0f376d9a8be84aa
2019-04-23 18:53:41 -07:00
Cating Lin
84e6a47895 The icon of suggestion_fingerprint should be blue.
Bug: b/131117150
Test: Manual Test
Change-Id: If7a07bf1caeb21f820e141f5412d91178007f7bc
2019-04-24 09:26:49 +08:00
TreeHugger Robot
0014cd721e Merge "Fix a NPE when removing accounts." into qt-dev 2019-04-24 01:22:49 +00:00