OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoMerge "Add bubbles animation" into qt-dev
Julia Reynolds [Thu, 25 Apr 2019 07:16:32 +0000 (00:16 -0700)]
Merge "Add bubbles animation" into qt-dev
am: 703e6aa092

Change-Id: I6421e2caf578ca0cb968fc03bf28b8b9a879b5ca

5 years agoMerge "Update "ask every time" asset." into qt-dev
Andrew Sapperstein [Thu, 25 Apr 2019 07:15:45 +0000 (00:15 -0700)]
Merge "Update "ask every time" asset." into qt-dev
am: 30859ac832

Change-Id: I5479181f38b75ad5b23ca8c9605baf36f681826b

5 years agoMerge "Remove disable mobile data confirm dialog for single sim." into qt-dev
Fan Zhang [Thu, 25 Apr 2019 07:14:59 +0000 (00:14 -0700)]
Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev
am: c78e4d1e0f

Change-Id: I10e0331a85f7bb1626639896ecca7a445855dcac

5 years agoMerge "Fix issue in panel logging" into qt-dev
Lei Yu [Thu, 25 Apr 2019 07:14:09 +0000 (00:14 -0700)]
Merge "Fix issue in panel logging" into qt-dev
am: 2b60204dba

Change-Id: I6561852b672e29f5aaddd2ef242e59698e1e2b6c

5 years agoMerge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
Fan Zhang [Thu, 25 Apr 2019 07:13:10 +0000 (00:13 -0700)]
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
am: 9fa82a370b

Change-Id: If9af81bfa4d99eee0b211b7216b3ca9d1baa66f2

5 years agoMerge "Implement off state for SIM details page" into qt-dev
Antony Sargent [Thu, 25 Apr 2019 07:12:19 +0000 (00:12 -0700)]
Merge "Implement off state for SIM details page" into qt-dev
am: 62d580d5b4

Change-Id: I37c513eb170667c6729b6a94a7788f24229dcf5a

5 years agoMerge "Update dialog background color for dark theme" into qt-dev
Mill Chen [Thu, 25 Apr 2019 07:11:08 +0000 (00:11 -0700)]
Merge "Update dialog background color for dark theme" into qt-dev
am: 235387c4f1

Change-Id: I3ee2f7e1c674efbc0caaa1a0ae36fe66f197f86e

5 years agoMerge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev
tmfang [Thu, 25 Apr 2019 07:10:18 +0000 (00:10 -0700)]
Merge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev
am: ab3f4062d1

Change-Id: I6f7a0fcbc80770ce66eb82fbf9054ae818145435

5 years agoMerge "String changes" into qt-dev
Julia Reynolds [Thu, 25 Apr 2019 07:09:27 +0000 (00:09 -0700)]
Merge "String changes" into qt-dev
am: 2f731500ad

Change-Id: Id5c5cc2c86211ee0e52394d9b3e35999486ee493

5 years agoMerge "Fix notification preferences" into qt-dev
Julia Reynolds [Thu, 25 Apr 2019 07:08:26 +0000 (00:08 -0700)]
Merge "Fix notification preferences" into qt-dev
am: 42eefd0d7e

Change-Id: I177e26feac7fd555e9e86c4bc730764a993e36bb

5 years agoMerge "The icon of suggestion_fingerprint should be blue." into qt-dev
Cating Lin [Thu, 25 Apr 2019 07:07:39 +0000 (00:07 -0700)]
Merge "The icon of suggestion_fingerprint should be blue." into qt-dev
am: 08319ee328

Change-Id: Id9e6f2e512bff148287a78e93cfb0032316122f6

5 years agoMerge "Use auth token from intent extras" into qt-dev
Ilya Matyukhin [Thu, 25 Apr 2019 06:44:06 +0000 (23:44 -0700)]
Merge "Use auth token from intent extras" into qt-dev
am: 172d03c758

Change-Id: Ia410ae2ee581bd318f5d245e829b7d4a53af9b12

5 years agoMerge "Add bubbles animation" into qt-dev
TreeHugger Robot [Thu, 25 Apr 2019 00:08:30 +0000 (00:08 +0000)]
Merge "Add bubbles animation" into qt-dev

5 years agoMerge "Update "ask every time" asset." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 23:57:30 +0000 (23:57 +0000)]
Merge "Update "ask every time" asset." into qt-dev

5 years agoMerge "Remove disable mobile data confirm dialog for single sim." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 22:50:24 +0000 (22:50 +0000)]
Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev

5 years agoMerge "Fix issue in panel logging" into qt-dev
Lei Yu [Wed, 24 Apr 2019 22:48:55 +0000 (22:48 +0000)]
Merge "Fix issue in panel logging" into qt-dev

5 years agoMerge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
Fan Zhang [Wed, 24 Apr 2019 21:44:53 +0000 (21:44 +0000)]
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev

5 years agoMerge "Implement off state for SIM details page" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 21:00:38 +0000 (21:00 +0000)]
Merge "Implement off state for SIM details page" into qt-dev

5 years agoRemove disable mobile data confirm dialog for single sim.
Fan Zhang [Wed, 24 Apr 2019 19:52:46 +0000 (12:52 -0700)]
Remove disable mobile data confirm dialog for single sim.

Fixes: 124005813
Test: robotest
Change-Id: I2da563f26d6dbb1ec3c6c205f21a96c896b51334

5 years agoAdd bubbles animation
Julia Reynolds [Wed, 24 Apr 2019 20:41:56 +0000 (16:41 -0400)]
Add bubbles animation

Test: manual
Fixes: 130653599
Change-Id: I2bd0499de2a9140a51440a57e8ed3bd8c34cccc1

5 years agoUpdate "ask every time" asset.
Andrew Sapperstein [Wed, 24 Apr 2019 19:56:17 +0000 (12:56 -0700)]
Update "ask every time" asset.

Fixes: 130550869
Test: visually inspected
Change-Id: I75356f1a05411ab9d4c396d283fd555ce7c1cd07

5 years agoFix issue in panel logging
Lei Yu [Tue, 23 Apr 2019 21:23:28 +0000 (14:23 -0700)]
Fix issue in panel logging

Update log key to slice uri since previous key has no meaning.

Previously it is something like:
androidx.slice.widget.SliceLiveData$SliceLiveDataImpl@1a30b5

Bug: 131094876
Test: Manual
Change-Id: I52d605eb826821ef622aa075c04f829c60692976

5 years agoMerge "Update dialog background color for dark theme" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 19:44:42 +0000 (19:44 +0000)]
Merge "Update dialog background color for dark theme" into qt-dev

5 years agoMerge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 18:09:37 +0000 (18:09 +0000)]
Merge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev

5 years agoImplement off state for SIM details page
Antony Sargent [Wed, 24 Apr 2019 17:44:37 +0000 (10:44 -0700)]
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

5 years agoMerge "String changes" into qt-dev
Julia Reynolds [Wed, 24 Apr 2019 17:46:42 +0000 (17:46 +0000)]
Merge "String changes" into qt-dev

5 years agoMerge "Fix notification preferences" into qt-dev
Julia Reynolds [Wed, 24 Apr 2019 17:46:28 +0000 (17:46 +0000)]
Merge "Fix notification preferences" into qt-dev

5 years agoMerge "The icon of suggestion_fingerprint should be blue." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 17:45:42 +0000 (17:45 +0000)]
Merge "The icon of suggestion_fingerprint should be blue." into qt-dev

5 years agoMerge "Use auth token from intent extras" into qt-dev
Ilya Matyukhin [Wed, 24 Apr 2019 16:27:55 +0000 (16:27 +0000)]
Merge "Use auth token from intent extras" into qt-dev

5 years agoFix incorrect mapping to get subscriptioninfo
andychou [Wed, 24 Apr 2019 15:12:09 +0000 (23:12 +0800)]
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

5 years agoString changes
Julia Reynolds [Wed, 24 Apr 2019 14:06:49 +0000 (10:06 -0400)]
String changes

Bug: 123899489
Test: make
Change-Id: I4ff2fdd6e0ef467d8385dcf3b75ace48458b88ab

5 years agoFix notification preferences
Julia Reynolds [Mon, 22 Apr 2019 14:30:41 +0000 (10:30 -0400)]
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

5 years agoMerge "Tweak search result for adaptive brightness" into qt-dev
tmfang [Wed, 24 Apr 2019 08:06:36 +0000 (01:06 -0700)]
Merge "Tweak search result for adaptive brightness" into qt-dev
am: 4d03377901

Change-Id: Id63484b713666cecf041b3eafe20f8a0360102ad

5 years agoUpdate dialog background color for dark theme
Mill Chen [Wed, 24 Apr 2019 07:20:02 +0000 (15:20 +0800)]
Update dialog background color for dark theme

Fixes: 129993336
Test: visual
Change-Id: Ie04be80e9b2987a8f7af1c7ecd1628474486bcd0

5 years agoMerge "Tweak search result for adaptive brightness" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 06:08:18 +0000 (06:08 +0000)]
Merge "Tweak search result for adaptive brightness" into qt-dev

5 years agoMerge "Stay in face settings unless the user explicitly backs out" into qt-dev
Kevin Chyn [Wed, 24 Apr 2019 05:37:29 +0000 (22:37 -0700)]
Merge "Stay in face settings unless the user explicitly backs out" into qt-dev
am: b70f2b58e0

Change-Id: I49ea46f8456ed4e418d942b3a059126c1962c685

5 years agoMerge "Stay in face settings unless the user explicitly backs out" into qt-dev
Kevin Chyn [Wed, 24 Apr 2019 04:56:11 +0000 (04:56 +0000)]
Merge "Stay in face settings unless the user explicitly backs out" into qt-dev

5 years agoFix CTS issue on PRIVACY_SETTINGS
tmfang [Wed, 24 Apr 2019 02:29:46 +0000 (10:29 +0800)]
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

5 years agoUse auth token from intent extras
Ilya Matyukhin [Wed, 24 Apr 2019 03:53:31 +0000 (20:53 -0700)]
Use auth token from intent extras

Bug: 124324349
Test: confirmation dialog doesn't show up when intent has auth token
Change-Id: I9e071b06e1041b0d3c78932d8cb2c16c4c32bca5

5 years agoMerge "Fix crash when no Bluetooth feature in Settings" into qt-dev
hughchen [Wed, 24 Apr 2019 02:57:47 +0000 (19:57 -0700)]
Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev
am: 7a237a40d7

Change-Id: Iaea1651a7ba22f1731ee8ad991664b073c5233c3

5 years agoMerge "Fix crash when no Bluetooth feature in Settings" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 02:45:09 +0000 (02:45 +0000)]
Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev

5 years agoTweak search result for adaptive brightness
tmfang [Thu, 18 Apr 2019 08:53:59 +0000 (16:53 +0800)]
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

5 years agoMerge "Fix a NPE when removing accounts." into qt-dev
Fan Zhang [Wed, 24 Apr 2019 02:03:19 +0000 (19:03 -0700)]
Merge "Fix a NPE when removing accounts." into qt-dev
am: 0014cd721e

Change-Id: I7eb956631acac2f44040aca5c9ee325007f8e1f5

5 years agoThe icon of suggestion_fingerprint should be blue.
Cating Lin [Wed, 24 Apr 2019 01:25:55 +0000 (09:25 +0800)]
The icon of suggestion_fingerprint should be blue.

Bug: b/131117150
Test: Manual Test
Change-Id: If7a07bf1caeb21f820e141f5412d91178007f7bc

5 years agoMerge "Fix a NPE when removing accounts." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 01:22:49 +0000 (01:22 +0000)]
Merge "Fix a NPE when removing accounts." into qt-dev

5 years agoMerge "Update toggle layout and always show footer text" into qt-dev
Kevin Chyn [Wed, 24 Apr 2019 01:21:45 +0000 (18:21 -0700)]
Merge "Update toggle layout and always show footer text" into qt-dev
am: e7eba5d246

Change-Id: I81ad6d91b104af0f2a7e0a24d5254608bd0304ad

5 years agoMerge "Fix robotests in settings/panel" into qt-dev
lindatseng [Wed, 24 Apr 2019 00:15:00 +0000 (17:15 -0700)]
Merge "Fix robotests in settings/panel" into qt-dev
am: 3225026ed6

Change-Id: I9e34dfd5420266fe43b119a352f0e93dc29b2993

5 years agoMerge "Update toggle layout and always show footer text" into qt-dev
Kevin Chyn [Wed, 24 Apr 2019 00:12:45 +0000 (00:12 +0000)]
Merge "Update toggle layout and always show footer text" into qt-dev

5 years agoStay in face settings unless the user explicitly backs out
Kevin Chyn [Tue, 23 Apr 2019 20:41:31 +0000 (13:41 -0700)]
Stay in face settings unless the user explicitly backs out

Bug: 130898604

Test: Builds
Change-Id: I7159c3a6259d298f78b8328b2c6974ba46fb56f9

5 years agoMerge "Fix robotests in settings/panel" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 23:44:31 +0000 (23:44 +0000)]
Merge "Fix robotests in settings/panel" into qt-dev

5 years agoMerge "Add overlayable_icons_test.xml for Settings." into qt-dev
Amin Shaikh [Tue, 23 Apr 2019 22:49:38 +0000 (15:49 -0700)]
Merge "Add overlayable_icons_test.xml for Settings." into qt-dev
am: cd52cf18ce

Change-Id: I3f926f0d02076e2c97b15a4e438d3bcb1b305f3c

5 years agoMerge "Test case clean up." into qt-dev
Fan Zhang [Tue, 23 Apr 2019 22:48:20 +0000 (15:48 -0700)]
Merge "Test case clean up." into qt-dev
am: c6bc40d397

Change-Id: I20ebfd2bddc7d93305f4075343d27bcf0c5ecc41

5 years agoMerge "Force the adapter to rebind cards with a toggle." into qt-dev
Fan Zhang [Tue, 23 Apr 2019 22:46:30 +0000 (15:46 -0700)]
Merge "Force the adapter to rebind cards with a toggle." into qt-dev
am: 141984df7f

Change-Id: I74eac95f91152760ca6abed6eff729e6eec0e933

5 years agoMerge "Add overlayable_icons_test.xml for Settings." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 22:39:55 +0000 (22:39 +0000)]
Merge "Add overlayable_icons_test.xml for Settings." into qt-dev

5 years agoMerge "Test case clean up." into qt-dev
Fan Zhang [Tue, 23 Apr 2019 22:34:46 +0000 (22:34 +0000)]
Merge "Test case clean up." into qt-dev

5 years agoMerge "Force the adapter to rebind cards with a toggle." into qt-dev
Fan Zhang [Tue, 23 Apr 2019 22:33:16 +0000 (22:33 +0000)]
Merge "Force the adapter to rebind cards with a toggle." into qt-dev

5 years agoFix a NPE when removing accounts.
Fan Zhang [Tue, 23 Apr 2019 22:09:39 +0000 (15:09 -0700)]
Fix a NPE when removing accounts.

Guard against null activity. If activity is already null, there is no
need to call finish().

Fixes: 131180213
Test: robotests
Change-Id: I19232ed67ddd0c3539b1827de23fdc584850b519

5 years agoFix robotests in settings/panel
lindatseng [Mon, 22 Apr 2019 23:14:53 +0000 (16:14 -0700)]
Fix robotests in settings/panel

Remove @Ignore for tests in settings/panel after testing.
Also update VolumePanelTest according to the recent changes to
remote volume slice.

Test: atest PanelFragmentTest
Test: atest SettingsPanelActivityTest
Test: VolumePanelTest
Fixes: 130896218
Change-Id: Iaa99e65d959cafd382d7209664f2fdbf660c29e0

5 years agoMerge "Always show disabled pSIMs in single-sim mode" into qt-dev
Antony Sargent [Tue, 23 Apr 2019 21:28:57 +0000 (14:28 -0700)]
Merge "Always show disabled pSIMs in single-sim mode" into qt-dev
am: cd07aa1cc4

Change-Id: I830e9604d1005f354d10ff5cb30c911243284e42

5 years agoMerge "Always show disabled pSIMs in single-sim mode" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 21:06:47 +0000 (21:06 +0000)]
Merge "Always show disabled pSIMs in single-sim mode" into qt-dev

5 years agoMerge "Using explicit Looper in Handler initialization." into qt-dev
Kweku Adams [Tue, 23 Apr 2019 19:24:50 +0000 (12:24 -0700)]
Merge "Using explicit Looper in Handler initialization." into qt-dev
am: bb1d4e7f1e

Change-Id: Iacf57a71ef728c6c0954973b6811825c47931ccd

5 years agoMerge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
Andrew Sapperstein [Tue, 23 Apr 2019 19:19:11 +0000 (12:19 -0700)]
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
am: 28cfb72aaa

Change-Id: I5543b540f1b61a4c0f844f11886e45d56959162d

5 years agoMerge "Reduce binder call to OverlayManager (3->1)" into qt-dev
Hyunyoung Song [Tue, 23 Apr 2019 19:12:12 +0000 (12:12 -0700)]
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev
am: 5f328aff51

Change-Id: Ief93c695a1c160fe4c53f4492d1b2c25eac59ce0

5 years agoAdd overlayable_icons_test.xml for Settings.
Amin Shaikh [Thu, 18 Apr 2019 12:18:25 +0000 (08:18 -0400)]
Add overlayable_icons_test.xml for Settings.

This ensures that developers do not accidentally delete/rename overlayed
icons without updating overlayable_icons_test.xml and renaming overlayed assets.

Bug: 128571899
Test: make RunSettingsRoboTests
Change-Id: I991883a7d480fbae848106ab24033a16d1405300

5 years agoMerge "Add action metrics for Wi-Fi provision features" into qt-dev
Arc Wang [Tue, 23 Apr 2019 18:57:02 +0000 (11:57 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
am: 79f75e483f

Change-Id: I66646329c5f7813679dc8181ddd70d1cc3b4d3e6

5 years agoMerge "Using explicit Looper in Handler initialization." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 18:28:56 +0000 (18:28 +0000)]
Merge "Using explicit Looper in Handler initialization." into qt-dev

5 years agoMerge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
Andrew Sapperstein [Tue, 23 Apr 2019 18:18:41 +0000 (18:18 +0000)]
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev

5 years agoMerge "Remove "unless turned on automatically" text" into qt-dev
Beverly [Tue, 23 Apr 2019 18:13:50 +0000 (11:13 -0700)]
Merge "Remove "unless turned on automatically" text" into qt-dev
am: 87158ed0b2

Change-Id: I9fcdb16ab74587f48c30cf703715fe7942e8023f

5 years agoAlways show disabled pSIMs in single-sim mode
Antony Sargent [Tue, 23 Apr 2019 17:55:51 +0000 (10:55 -0700)]
Always show disabled pSIMs in single-sim mode

In single-sim mode, you can have both an eSIM subscription and a pSIM
inserted into the device, and only one of them can be enabled. It turns
out that if the pSIM is the disabled one, we would not show it in the
settings UI; this CL fixes that.

It also fixes a somewhat related problem that I noticed while testing
this, that if you have only one subscription that happens to be
disabled, we were not showing the on/off switch at the top of the page,
which would leave you with no way to enable it.

Bug: 129864878
Test: make RunSettingsRoboTests
Change-Id: I4214ad34c59ac2df429772c066c51a9318f5baa7

5 years agoMerge "Reduce binder call to OverlayManager (3->1)" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 17:50:05 +0000 (17:50 +0000)]
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev

5 years agoMerge "Add action metrics for Wi-Fi provision features" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 17:36:54 +0000 (17:36 +0000)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev

5 years agoMerge "Remove "unless turned on automatically" text" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 17:02:28 +0000 (17:02 +0000)]
Merge "Remove "unless turned on automatically" text" into qt-dev

5 years agoMerge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
Jason Chiu [Tue, 23 Apr 2019 16:13:56 +0000 (09:13 -0700)]
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
am: 805e208f14

Change-Id: I733b0eb6cfded17baa0f1fb1e329618fb16547c3

5 years agoRemove "unless turned on automatically" text
Beverly [Tue, 23 Apr 2019 14:08:32 +0000 (10:08 -0400)]
Remove "unless turned on automatically" text

- In Q, the title of this preference was changed from
"Duration" to "Default duration."  The title change clarifies
that the preference controls the dnd default duration and not the
schedules, so we can now remove "unless turned on automatically"
text in the subtext.

Test: manual
Fixes: 130843902
Change-Id: I404acd61136e1e1aa4675e421c07ce871c1f9db9

5 years agoTest case clean up.
Yi-Ling Chuang [Tue, 23 Apr 2019 12:41:50 +0000 (20:41 +0800)]
Test case clean up.

Move some test cases from ContextualCardLoader to
EligibleCardChecker.

Fixes: 131147203
Test: robotests
Change-Id: Ia6508962d7b878c5f89b8d350c791a44cadb9d36

5 years agoMerge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 11:47:21 +0000 (11:47 +0000)]
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev

5 years agoMerge "Expand advanced button by default in Notifications." into qt-dev
Yi-Ling Chuang [Tue, 23 Apr 2019 09:43:17 +0000 (02:43 -0700)]
Merge "Expand advanced button by default in Notifications." into qt-dev
am: ab2b8c5bfa

Change-Id: Ided47e34125d26ece6bdea048b444a90a8b8b2b5

5 years agoMerge "Expand advanced button by default in Notifications." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 09:33:47 +0000 (09:33 +0000)]
Merge "Expand advanced button by default in Notifications." into qt-dev

5 years agoForce the adapter to rebind cards with a toggle.
Yi-Ling Chuang [Thu, 18 Apr 2019 08:29:45 +0000 (16:29 +0800)]
Force the adapter to rebind cards with a toggle.

A card dismissal and scheduled card collection trigger a reload. During
card reloading, we perform slices pre check. The pre check goes through
the whole slice binding process, which means slices will be pinned and unpinned.
Hence, the on screen slices will gets unpinned resulting to the
unresponsive toggling.

As we have DiffCallbck implmented, if the card list are the same, then
bindView in the renderer will be ignored, which means the unpinned slice
will have no chance to re-register slice callback. So here we force it
to rebind the views.

Fixes: 123174237
Test: robotests
Change-Id: Id98bc16632bf024cbb611b40890e4d2629f08d7b

5 years agoFix WifiDetailPreferenceControllerTest new test case failure
clownshen [Tue, 23 Apr 2019 09:15:32 +0000 (17:15 +0800)]
Fix WifiDetailPreferenceControllerTest new test case failure

Bug: 130370187
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I314702be14db4e853412874c123e0a4b229849a2

5 years agoMerge "Change description string of Wi-Fi add device" into qt-dev
Arc Wang [Tue, 23 Apr 2019 04:47:19 +0000 (21:47 -0700)]
Merge "Change description string of Wi-Fi add device" into qt-dev
am: dd310fa892

Change-Id: I2d5ad539a8cf480a1d47b597b8f71b778aa12bb7

5 years agoMerge "Change description string of Wi-Fi add device" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 04:32:26 +0000 (04:32 +0000)]
Merge "Change description string of Wi-Fi add device" into qt-dev

5 years agoAutomatically direct the user to the captive portal in Wi-Fi Slice
Jason Chiu [Fri, 19 Apr 2019 10:47:39 +0000 (18:47 +0800)]
Automatically direct the user to the captive portal in Wi-Fi Slice

Save the SSID when the user clicks the network, and then automatically
start login page when the network gets the captive portal capability.

Fixes: 128056349
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ia25241a8243d7d6aae604f341b512350404d9fd1

5 years agoMerge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
Clown SHEN [Tue, 23 Apr 2019 03:15:35 +0000 (20:15 -0700)]
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
am: 2a14b7e8b5

Change-Id: If34484a29f3338bb594e47e65ae9f4c9049cfd7e

5 years agoMerge "Correct detail page UI once user change MAC randomized setting" into qt-dev
Clown SHEN [Tue, 23 Apr 2019 03:13:24 +0000 (20:13 -0700)]
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev
am: 2e340d284e

Change-Id: I65852f7e05b31db4633a27d007c3bc5e0f0326f6

5 years agoMerge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
Clown SHEN [Tue, 23 Apr 2019 03:02:31 +0000 (03:02 +0000)]
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev

5 years agoMerge "Correct detail page UI once user change MAC randomized setting" into qt-dev
Clown SHEN [Tue, 23 Apr 2019 03:01:48 +0000 (03:01 +0000)]
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev

5 years agoUpdate toggle layout and always show footer text
Kevin Chyn [Tue, 23 Apr 2019 01:17:11 +0000 (18:17 -0700)]
Update toggle layout and always show footer text

Fixes: 130740123

Test: Builds

Change-Id: I5f64e22ca8123c6f2825d4341d94581a301551f7

5 years agoMerge "Remove todo comment" into qt-dev
Alex Salo [Tue, 23 Apr 2019 01:20:57 +0000 (18:20 -0700)]
Merge "Remove todo comment" into qt-dev
am: 37db031aa1

Change-Id: If7ae4aab6b59ebe0b6a759cd464d9054b11be3b0

5 years agoMerge "Improve some comments of strings and codes" into qt-dev
cosmohsieh [Tue, 23 Apr 2019 01:01:09 +0000 (18:01 -0700)]
Merge "Improve some comments of strings and codes" into qt-dev
am: 0bc3fac6d9

Change-Id: I7638a753e235ae4dee29cb0294918e896089d85e

5 years agoMerge "Update enrollment footer icon" into qt-dev
Kevin Chyn [Tue, 23 Apr 2019 01:00:13 +0000 (18:00 -0700)]
Merge "Update enrollment footer icon" into qt-dev
am: c9239e11b6

Change-Id: I64f8178d7838781ddc3f1a86117e59f9ca81617a

5 years agoMerge "Update introduction layout spacing" into qt-dev
Kevin Chyn [Tue, 23 Apr 2019 00:55:21 +0000 (17:55 -0700)]
Merge "Update introduction layout spacing" into qt-dev
am: 89f0d5274a

Change-Id: I197d2451018bf3b6ae4d9135fd716fcaab0797b7

5 years agoMerge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
Lei Yu [Tue, 23 Apr 2019 00:50:40 +0000 (17:50 -0700)]
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
am: 357825d228

Change-Id: I5e64d99af01a568f2f98fbda0240ca09e85fc65c

5 years agoMerge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
Fan Zhang [Tue, 23 Apr 2019 00:32:32 +0000 (17:32 -0700)]
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
am: 5e42b894bc

Change-Id: Id3fc9e6a6e211d530d4b33a0050fafd0de11e2d7

5 years agoMerge "Remove todo comment" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 00:19:26 +0000 (00:19 +0000)]
Merge "Remove todo comment" into qt-dev

5 years agoMerge "Improve some comments of strings and codes" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 00:04:56 +0000 (00:04 +0000)]
Merge "Improve some comments of strings and codes" into qt-dev

5 years agoReduce binder call to OverlayManager (3->1)
Hyunyoung Song [Mon, 22 Apr 2019 23:27:50 +0000 (16:27 -0700)]
Reduce binder call to OverlayManager (3->1)

Bug: 131112014
Test: builds, manually tested

Change-Id: I1f0fba30a55713be92b8755c0793ee84928f9d5e

5 years agoUsing explicit Looper in Handler initialization.
Kweku Adams [Mon, 22 Apr 2019 21:52:21 +0000 (14:52 -0700)]
Using explicit Looper in Handler initialization.

Bug: 130639146
Test: flash device and toggle settings
Change-Id: I40d0578487c94da9fc9d940089bacbddf3a43751

5 years agoMerge "Update enrollment footer icon" into qt-dev
Kevin Chyn [Mon, 22 Apr 2019 23:23:16 +0000 (23:23 +0000)]
Merge "Update enrollment footer icon" into qt-dev

5 years agoMerge "Update introduction layout spacing" into qt-dev
Kevin Chyn [Mon, 22 Apr 2019 23:16:39 +0000 (23:16 +0000)]
Merge "Update introduction layout spacing" into qt-dev