OSDN Git Service

android-x86/packages-apps-Settings.git
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 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 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 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 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

5 years agoMerge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
Lei Yu [Mon, 22 Apr 2019 22:57:24 +0000 (22:57 +0000)]
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev

5 years agoTest fix: Add MmsPreferenceController to whitelist
Lei Yu [Mon, 22 Apr 2019 22:51:58 +0000 (15:51 -0700)]
Test fix: Add MmsPreferenceController to whitelist

Add it to grandfather_slice_controller_not_in_xml since right now
it only exists in mobile_network_settings_v2.xml, not v1.

This should be fixed automatically once we remove all old code.

Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Ib0bc976fd31818d7b39ca9f3e7427859fd7175ff

5 years agoMerge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
Fan Zhang [Mon, 22 Apr 2019 22:48:59 +0000 (22:48 +0000)]
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev

5 years agoMerge "Fix CodeInspectionTest" into qt-dev
Fan Zhang [Mon, 22 Apr 2019 22:14:51 +0000 (15:14 -0700)]
Merge "Fix CodeInspectionTest" into qt-dev
am: 4b54ad9bd5

Change-Id: I9f5885c5c9e52019ea9142337b18722e903a459c

5 years agoRemove todo comment
Alex Salo [Mon, 22 Apr 2019 21:54:51 +0000 (14:54 -0700)]
Remove todo comment

Bug: 129352433
Test: not needed
Change-Id: I7aa7840c0852c17ed05dba684fdd84cb7d5ad4ed

5 years agoMerge "Fix CodeInspectionTest" into qt-dev
TreeHugger Robot [Mon, 22 Apr 2019 21:37:29 +0000 (21:37 +0000)]
Merge "Fix CodeInspectionTest" into qt-dev

5 years agoUpdate enrollment footer icon
Kevin Chyn [Mon, 22 Apr 2019 19:38:33 +0000 (12:38 -0700)]
Update enrollment footer icon

Fixes: 131094701

Test: Builds
Change-Id: I9e1a75986ffeb35791271d55bf05a2daa9af5bad

5 years agoPartial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
Fan Zhang [Mon, 22 Apr 2019 19:28:07 +0000 (12:28 -0700)]
Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5

The previous change removed summary text for gesture settings too
aggresively. We still need summary in main Settings app, just not in
search.

Fixes: 130652619
Test: manual
Change-Id: I95ae3ca31b34a514f10993413527e987cf67d998

5 years agoUpdate introduction layout spacing
Kevin Chyn [Thu, 18 Apr 2019 23:34:37 +0000 (16:34 -0700)]
Update introduction layout spacing

Bug: 130740990

Test: builds
Change-Id: I2c10d991097fcdb7eb0775f744b5b12af2597780

5 years agoMerge "Add mms preference and controller" into qt-dev
Lei Yu [Mon, 22 Apr 2019 18:14:34 +0000 (11:14 -0700)]
Merge "Add mms preference and controller" into qt-dev
am: f3365e911d

Change-Id: I7d564e576a0ce387f376e71af54839794a3281cd

5 years agoMerge "Remove feature flag for slice injection" into qt-dev
Lei Yu [Mon, 22 Apr 2019 18:10:37 +0000 (11:10 -0700)]
Merge "Remove feature flag for slice injection" into qt-dev
am: fe393599a0

Change-Id: I8cb5753b3d809811464b8410e3b26be35e0efca6

5 years agoMerge "Add mms preference and controller" into qt-dev
Lei Yu [Mon, 22 Apr 2019 17:55:34 +0000 (17:55 +0000)]
Merge "Add mms preference and controller" into qt-dev

5 years agoMerge "Remove feature flag for slice injection" into qt-dev
Lei Yu [Mon, 22 Apr 2019 17:49:52 +0000 (17:49 +0000)]
Merge "Remove feature flag for slice injection" into qt-dev

5 years agoRemove "Play media to" when no connected device
Tim Peng [Mon, 22 Apr 2019 17:03:39 +0000 (10:03 -0700)]
Remove "Play media to" when no connected device
am: 99ed023ca4

Change-Id: I462ce390a7addc95ceacb0f0a4e48382ac34aed5

5 years agoFix WifiDetailPreferenceControllerTest failure
clownshen [Mon, 22 Apr 2019 10:33:46 +0000 (18:33 +0800)]
Fix WifiDetailPreferenceControllerTest failure

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

5 years agoRemove "Play media to" when no connected device
Tim Peng [Mon, 22 Apr 2019 06:05:09 +0000 (14:05 +0800)]
Remove "Play media to" when no connected device

Bug: 130251782
Test: make -j42 RunSettingsRoboTests
Change-Id: Id40199a67aef48b99f59cf6e04f93be2abe5e8fc

5 years agoExpand advanced button by default in Notifications.
Yi-Ling Chuang [Fri, 19 Apr 2019 11:03:46 +0000 (19:03 +0800)]
Expand advanced button by default in Notifications.

When users search for a certain preference hidden in advanced group
in Notifications page, we should expand the advanced button so
users can see the highlighted preference.

Fixes: 130655529
Test: visual
Change-Id: I6a166ddd1e741651d3a3a76ccfc37c58eafdf7e1

5 years agoCorrect detail page UI once user change MAC randomized setting
clownshen [Wed, 17 Apr 2019 11:33:37 +0000 (19:33 +0800)]
Correct detail page UI once user change MAC randomized setting

Changing MAC randomized setting will disconnect and reconnect Wi-Fi in
the background automatically. UI display as disconnect even AP
reconnected. Fix this problem and also remove some obsolete code.
Another problem is connect button display as disabled with
"Connecting..." wording after user click connect then change the MAC
randomized setting.

Bug: 130370187
Test: Manual test with test case in go/wifi_connnection_btn_design
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: Id87c3db0cc785a9ceb3a71c7cbb78ffd87ffb0a1

5 years agoChange description string of Wi-Fi add device
Arc Wang [Mon, 22 Apr 2019 03:06:16 +0000 (11:06 +0800)]
Change description string of Wi-Fi add device

Bug: 130825364
Test: manual
Change-Id: Ic633cfa80475a438be94fabb0527c24ec9df39a9

5 years agoImprove some comments of strings and codes
cosmohsieh [Thu, 18 Apr 2019 02:58:45 +0000 (10:58 +0800)]
Improve some comments of strings and codes

1) Correct improper function comment about forget menu
2) Extends char limit of wifi_scan_always_turn_on_message_unknown for
translation.
3) Correct string comment on Saved networks summary

Bug: 130628569
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I0e60e4f205c794367dfffc032cb4334dac4d1cdd

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sun, 21 Apr 2019 04:50:42 +0000 (21:50 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: f263f489e2 -s ours
am skip reason: subject contains skip directive

Change-Id: I29eb85d5002e7028c1e9fcd24f736c7586f4310e

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Sun, 21 Apr 2019 04:43:31 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 21 Apr 2019 00:58:18 +0000 (17:58 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I681232854213f3b89d0543d30c640622d759a396

5 years agoMerge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAIL...
Jonathan Scott [Sat, 20 Apr 2019 23:24:57 +0000 (16:24 -0700)]
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
am: 5a8cf48813

Change-Id: Icea3822382cd2d6c21cedeb1560c4ed2f316d316

5 years agoMerge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAIL...
TreeHugger Robot [Sat, 20 Apr 2019 23:16:25 +0000 (23:16 +0000)]
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev

5 years ago[automerger skipped] Merge "Ignore the outdated entitlement check" into qt-dev
Mark Chien [Sat, 20 Apr 2019 05:06:49 +0000 (22:06 -0700)]
[automerger skipped] Merge "Ignore the outdated entitlement check" into qt-dev
am: 77b7618138 -s ours
am skip reason: change_id Id3157df1a5758f8c72acbc45c9fefd2215c87395 with SHA1 f9f0d11782 is in history

Change-Id: I567c0256f1fbb449b7c7fe2b186b5455a7425d9a

5 years agoMerge "Ignore the outdated entitlement check" into qt-dev
Mark Chien [Sat, 20 Apr 2019 04:41:52 +0000 (04:41 +0000)]
Merge "Ignore the outdated entitlement check" into qt-dev

5 years agoMerge "Ignore the outdated entitlement check" am: d7885ca73a
Mark Chien [Sat, 20 Apr 2019 04:07:49 +0000 (21:07 -0700)]
Merge "Ignore the outdated entitlement check" am: d7885ca73a
am: 7b30503dc4

Change-Id: I294f9f2e9ca239cb8f1c689580ce266ddead8f5b

5 years agoMerge "Ignore the outdated entitlement check"
Mark Chien [Sat, 20 Apr 2019 03:26:15 +0000 (20:26 -0700)]
Merge "Ignore the outdated entitlement check"
am: d7885ca73a

Change-Id: If610c3233137562571eeff0b2d73b2bdd946ebd9

5 years agoMerge "Ignore the outdated entitlement check"
Mark Chien [Sat, 20 Apr 2019 02:05:33 +0000 (02:05 +0000)]
Merge "Ignore the outdated entitlement check"

5 years agoMerge "Allow up two lines of text on dnd restrict notif" into qt-dev
Beverly [Sat, 20 Apr 2019 00:28:45 +0000 (17:28 -0700)]
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
am: f09245150d

Change-Id: I159f4c670c2a103fe5c3fdb87e62e0e21a42bc5b

5 years agoMerge "Fix battery robo test" into qt-dev
Lei Yu [Sat, 20 Apr 2019 00:20:53 +0000 (17:20 -0700)]
Merge "Fix battery robo test" into qt-dev
am: fc48118694

Change-Id: Id0bcad14d216bb2718435dffdb802e105af440d4

5 years agoMerge "Allow up two lines of text on dnd restrict notif" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 23:20:10 +0000 (23:20 +0000)]
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev

5 years agoMerge "Fix battery robo test" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 23:13:51 +0000 (23:13 +0000)]
Merge "Fix battery robo test" into qt-dev

5 years agoMerge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
Salvador Martinez [Fri, 19 Apr 2019 22:56:21 +0000 (15:56 -0700)]
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
am: 022af8ca10

Change-Id: Ie0e16d985ef878e9989ad4037947ff57e34749fc

5 years agoMerge "Fix typo" into qt-dev
Fan Zhang [Fri, 19 Apr 2019 22:54:48 +0000 (15:54 -0700)]
Merge "Fix typo" into qt-dev
am: 33f136fdec

Change-Id: If6ba4153c8f642643054e1f7e949d4111a6e3b7e

5 years agoMerge "Add a way to suppress injected tiles for OEMs" into qt-dev
Fan Zhang [Fri, 19 Apr 2019 22:53:26 +0000 (15:53 -0700)]
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
am: ac76a480bd

Change-Id: I5d72983c4c9cda2a6cfb36fb5931dfdff00ac45f

5 years agoMerge "Add @Ignore for all failing tests." into qt-dev
Fan Zhang [Fri, 19 Apr 2019 22:21:59 +0000 (15:21 -0700)]
Merge "Add @Ignore for all failing tests." into qt-dev
am: 1830440231

Change-Id: Ic779b72c3bf3a06e32c7dbe11f87e654baf70664

5 years agoMerge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
Salvador Martinez [Fri, 19 Apr 2019 22:00:27 +0000 (22:00 +0000)]
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev

5 years agoRemove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE
Jonathan Scott [Fri, 19 Apr 2019 21:19:21 +0000 (22:19 +0100)]
Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE

This is already covered by
getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable and
getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable.

Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest
Fixes: 130896049
Change-Id: I3dbbbde693750c69e042f7c19143730cc8e313ff

5 years agoFix CodeInspectionTest
Fan Zhang [Fri, 19 Apr 2019 20:50:16 +0000 (13:50 -0700)]
Fix CodeInspectionTest

Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6

5 years agoFix battery robo test
Lei Yu [Fri, 19 Apr 2019 20:36:31 +0000 (13:36 -0700)]
Fix battery robo test

Fixes: 130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062

5 years agoMerge "Fix typo" into qt-dev
Fan Zhang [Fri, 19 Apr 2019 20:32:37 +0000 (20:32 +0000)]
Merge "Fix typo" into qt-dev

5 years agoFix typo
Fan Zhang [Fri, 19 Apr 2019 20:31:36 +0000 (13:31 -0700)]
Fix typo

Bug: 130897882
Test: rebuild
Change-Id: I066b69634214cd25c4acbd173e8fe82cd73d4e97

5 years agoMerge "Add a way to suppress injected tiles for OEMs" into qt-dev
Fan Zhang [Fri, 19 Apr 2019 20:30:24 +0000 (20:30 +0000)]
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev

5 years agoMerge "Add @Ignore for all failing tests." into qt-dev
Fan Zhang [Fri, 19 Apr 2019 20:28:47 +0000 (20:28 +0000)]
Merge "Add @Ignore for all failing tests." into qt-dev

5 years agoAdd @Ignore for all failing tests.
Fan Zhang [Fri, 19 Apr 2019 20:23:29 +0000 (13:23 -0700)]
Add @Ignore for all failing tests.

Bug: 130896210
Bug: 130896218
Bug: 130896701
Bug: 130897882
Bug: 130897305
Bug: 130897640
Bug: 130896049
Test: robo
Change-Id: I77143d504501b358c2103aa736cd2aad13ed4c5c

5 years agoMerge "Add SettingsPolicy to control BT feature" into qt-dev
Lei Yu [Fri, 19 Apr 2019 20:18:15 +0000 (13:18 -0700)]
Merge "Add SettingsPolicy to control BT feature" into qt-dev
am: 125ab50a55

Change-Id: I46f37c9a1ac92bd3e77e2a2f8ff185a72436851e

5 years agoRemove feature flag for slice injection
Lei Yu [Fri, 19 Apr 2019 20:09:30 +0000 (13:09 -0700)]
Remove feature flag for slice injection

Since we already use SettingsUIDeviceConfig in this case, we can remove
feature flag safely.

Fixes: 121154979
Test: Manual
Change-Id: Ibf71f1109fd506feba5a02bf6ecd804c6b7ee8d4

5 years agoMerge "Add SettingsPolicy to control BT feature" into qt-dev
Lei Yu [Fri, 19 Apr 2019 19:44:53 +0000 (19:44 +0000)]
Merge "Add SettingsPolicy to control BT feature" into qt-dev

5 years agoAdd mms preference and controller
Lei Yu [Thu, 18 Apr 2019 18:22:36 +0000 (11:22 -0700)]
Add mms preference and controller

Only visible when it is metered and mobile data off.
Also refactor one mobile data observer so we can reuse it.

Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Id218f51da3c373fad98c1a39cfadd6b0e8c46a88

5 years agoMerge "Set max num of slices allowed in panel view" into qt-dev
Linda Tseng [Fri, 19 Apr 2019 17:36:41 +0000 (10:36 -0700)]
Merge "Set max num of slices allowed in panel view" into qt-dev
am: ae344faf4a

Change-Id: Id9ffef1fd7a7007a143661b221dd9d82dc9858b5

5 years agoUpdate battery stuff to use SettingsLib Estimate class
Salvador Martinez [Fri, 12 Apr 2019 00:12:44 +0000 (17:12 -0700)]
Update battery stuff to use SettingsLib Estimate class

This will make the upcoming consistency Cl easier to implement.

Test: Robotests still pass
Bug: 124030091
Change-Id: Ief4989e2b5f9b83b5c3b93d17f9f9fa12136f3ee

5 years agoAdd a way to suppress injected tiles for OEMs
Yanting Yang [Thu, 18 Apr 2019 13:37:31 +0000 (21:37 +0800)]
Add a way to suppress injected tiles for OEMs

Create a config resource for OEMs to add suppressed tile's key, then
DashboardFragment will filter related tiles out from Settings.

OEMs can use this way to suppress security patch injected tile if they
don't use Google OTA.

Fixes: 130734771
Test: visual, robotests
Change-Id: I4cab79c8672048fa543d39b2a8f38ffe338189c8

5 years agoAllow up two lines of text on dnd restrict notif
Beverly [Fri, 19 Apr 2019 17:21:31 +0000 (13:21 -0400)]
Allow up two lines of text on dnd restrict notif

Test: manual
Bug: 130848971
Change-Id: I1d32963f0e291d42c8b98ba8ca39eba749a26989

5 years agoMerge "Set max num of slices allowed in panel view" into qt-dev
Linda Tseng [Fri, 19 Apr 2019 17:19:59 +0000 (17:19 +0000)]
Merge "Set max num of slices allowed in panel view" into qt-dev

5 years agoMerge "Fix broken tests" into qt-dev
Julia Reynolds [Fri, 19 Apr 2019 16:51:37 +0000 (09:51 -0700)]
Merge "Fix broken tests" into qt-dev
am: 1115d61c0b

Change-Id: I16026c2a7306fecb02230d1403f31efd50e297e2

5 years agoMerge "Remove all device from preference when BT is disabled" into qt-dev
hughchen [Fri, 19 Apr 2019 16:46:50 +0000 (09:46 -0700)]
Merge "Remove all device from preference when BT is disabled" into qt-dev
am: e69a25caad

Change-Id: I84cb23ab372c897121ea239aa8f1f4c337f5d59d

5 years agoMerge "Fix broken tests" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 16:32:15 +0000 (16:32 +0000)]
Merge "Fix broken tests" into qt-dev

5 years agoMerge "Remove all device from preference when BT is disabled" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 16:25:26 +0000 (16:25 +0000)]
Merge "Remove all device from preference when BT is disabled" into qt-dev

5 years agoMerge "Fix the break of repo hook color check." into qt-dev
Yi-Ling Chuang [Fri, 19 Apr 2019 15:53:31 +0000 (08:53 -0700)]
Merge "Fix the break of repo hook color check." into qt-dev
am: 73ab8fcb63

Change-Id: Iacab2b9a297bc17826d8eb2c17d45e9bf1d5f416

5 years agoMerge "Fix the break of repo hook color check." into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 15:38:03 +0000 (15:38 +0000)]
Merge "Fix the break of repo hook color check." into qt-dev