Commit Graph

49108 Commits

Author SHA1 Message Date
pastychang
908501e40f Apply FooterButton builder
FotterButton constructor in setupcompat will be deprecated, change to
use builder.

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ic84b0c91205bf3c770bc658e8eaf2626e4d7bddd
2018-12-26 14:56:44 +08:00
Pasty Chang
2fe6673d9e Merge "Migrating to new footer button for lockscreen pages." 2018-12-26 06:31:15 +00:00
pastychang
5dfdb4ff45 Migrating to new footer button for lockscreen pages.
Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: I12d68cd2eaa750eecd2c40e172efd6b6b16a0849
2018-12-26 11:12:46 +08:00
Stanley Wang
847c0660a5 Implement the Copyable interface to FirmwareVersionPreferenceController
Copy the device version number to clipboard for Copyable.

Change-Id: Ibb687be442dd702c1197c7e8295fac5b914a7047
Fixes: 121463656
Test: manual and robotests
2018-12-25 11:04:16 +00:00
TreeHugger Robot
eb5e435dc6 Merge "Cleans up DefaultAppShortcutPreferenceControllerBaseTest.java" 2018-12-24 06:05:26 +00:00
Cn Chen
8428d04677 Merge "Change layout prefix of setupdesign from suw to sud" 2018-12-24 03:52:00 +00:00
Console Chen
4d91915774 Cleans up DefaultAppShortcutPreferenceControllerBaseTest.java
- Checks the next started activity in robolectric with:
  ShadowActivity.getNextStartedActivity();
  instead of spying Activity
- Uses ShadowUserManager instead of spying UserManager

Change-Id: I3de9637f77401ca0dfab1b061a2846e7443170ad
Fixes: 117990359
Test: Robo test
2018-12-24 11:29:06 +08:00
pastychang
8d2dc16d7f Change layout prefix of setupdesign from suw to sud
Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Icd24f0336191c4575838cb1b9d131c885304b527
2018-12-24 10:13:54 +08:00
Pengquan Meng
92da0c0005 Merge "Set default value for mobile listPreference" 2018-12-23 02:18:20 +00:00
Raff Tsai
ecc5bf11f1 Remove ignore in Robolectric test
This was broken due to framework changes. Now framework works with
this well.

Change-Id: I2d862d4851efaefcd9866e9fd4b6deb6450f296c
Fixes: 119592320
Test: make RunSettingsRoboTests
2018-12-22 17:06:52 +08:00
James Lemieux
ad8d702b06 Merge "Fix test cases for impending Robolectric merge" 2018-12-22 01:50:48 +00:00
Bill Yi
c76becb786 [automerger skipped] Import translations. DO NOT MERGE am: 05cf17a925 -s ours
am: 9ad826208e  -s ours

Change-Id: I0615833b428b3a9ccb115073420402e9d07d2e94
2018-12-21 17:27:10 -08:00
Bill Yi
9ad826208e [automerger skipped] Import translations. DO NOT MERGE
am: 05cf17a925  -s ours

Change-Id: I2c59a155b3d113099069840a08da8d90f8d1543c
2018-12-21 17:21:21 -08:00
TreeHugger Robot
2705f9fd98 Merge "Add mechanism for vendor-specific enrollment" 2018-12-22 01:01:53 +00:00
Bill Yi
05cf17a925 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 118717573
Change-Id: Ifd74addec939651ce1aafca0d422f7fb65553a3a
2018-12-21 16:07:42 -08:00
jackqdyulei
6d70582054 Set default value for mobile listPreference
In some cases we don't set value for listPreference, so we need to set
a default one. This is a bug from code migration.

Change-Id: I8072b2a288a6a1254dceabea963f19459b0a9011
Fixes: 119770064
Test: RunSettingsRoboTests
2018-12-21 15:34:42 -08:00
Kevin Chyn
3205fe6419 Merge "Revert "Get enrollment animation from overlay"" 2018-12-21 22:23:55 +00:00
James Lemieux
db06e1f9b8 Fix test cases for impending Robolectric merge
Bug: 121048884
Test: make -j56 RunSettingsRoboTests
Change-Id: I13568f48b66c79ff6f7806d8bc2c54ba05e7f595
2018-12-21 14:20:11 -08:00
TreeHugger Robot
19ce37648a Merge "Add custom dnd pages for each dnd auto rule" 2018-12-21 21:16:38 +00:00
Kevin Chyn
28ac88a736 Add mechanism for vendor-specific enrollment
Bug: 111548033
Test: Builds
Change-Id: I1b87d40a584ea21c3de50651f880ce94ed7d40d7
2018-12-21 12:42:57 -08:00
Kevin Chyn
4cedaafe0e Revert "Get enrollment animation from overlay"
This reverts commit 9ed7cb40cb.

Bug: 111548033
Bug: 121222038
Change-Id: Ic9c85628c45ea5327d0d3b6969034c13789b920c
2018-12-21 10:30:34 -08:00
Yanting Yang
6b17d51070 Merge "Limit displayable rows in BluetoothDevicesSlice" 2018-12-21 11:46:45 +00:00
Stanley Wang
2beb5442bb Merge "Implement the Copyable interface to BuildNumberPreferenceController" 2018-12-21 10:39:47 +00:00
Yanting Yang
0fc817bd1b Limit displayable rows in BluetoothDevicesSlice
The maximum displayable row count in current design is 3.
i.e., There are 1 header and 3 rows in a Slice when the number of
Bluetooth device exceeds 3.

Change-Id: Ie585617da0665dde4cbe1ab60a2693e3e1199c27
Fixes: 121308955
Bug: 114807655
Test: visual, robotests
2018-12-21 17:29:23 +08:00
TreeHugger Robot
3a84f484e7 Merge "Add GPS to location setting's search keyword" 2018-12-21 07:27:37 +00:00
Yanting Yang
040124cca2 Merge "Support Bluetooth activation in BluetoothDevicesSlice" 2018-12-21 03:44:42 +00:00
TreeHugger Robot
0b9740883f Merge "Remove tests in WifiSettingsUiTest" 2018-12-21 03:33:34 +00:00
Android Build Merger (Role)
ea740ea695 Merge "[automerger skipped] Merge "Moved data settings to phone" am: bcd6a7db39 am: 67475a5c66 am: a91d29f5f0 -s ours" 2018-12-21 03:29:41 +00:00
Jack Yu
4b30ab23b3 [automerger skipped] Merge "Moved data settings to phone" am: bcd6a7db39 am: 67475a5c66
am: a91d29f5f0  -s ours

Change-Id: Ib7852dc376747b05a6e7ce1fb3391418d7ab01ef
2018-12-20 19:28:54 -08:00
Pasty Chang
303f694a9f Merge "Migrating to new footer button for storage migrated pages" 2018-12-21 03:27:06 +00:00
Jack Yu
a91d29f5f0 Merge "Moved data settings to phone" am: bcd6a7db39
am: 67475a5c66

Change-Id: I5ae8d51ffbdfa41c0cfacd49a2d10524f6abdd25
2018-12-20 19:13:21 -08:00
Jack Yu
67475a5c66 Merge "Moved data settings to phone"
am: bcd6a7db39

Change-Id: I8fde45278c4a5db14f986ea87ab2bfa15b7507ab
2018-12-20 19:01:06 -08:00
Stanley Wang
118a712486 Implement the Copyable interface to BuildNumberPreferenceController
Fixes: 121233543
Test: manual and robotests
Change-Id: I4f424be6dfeb2c9fc9ac0bc11b38139f7d52b2b7
2018-12-21 10:57:45 +08:00
TreeHugger Robot
ca9e3ca831 Merge "Remove frictionIconColor attribute" 2018-12-21 02:45:08 +00:00
Calvin Pan
e90a5a6812 Merge "Rename SIM_APN_LIST to SIM_APN_URI" am: d594716359 am: a49da46d96
am: 8c758f5ce7

Change-Id: Idbefe3b3cd87e4702852defa7382c30ff8f98e50
2018-12-20 18:34:36 -08:00
Jack Yu
bcd6a7db39 Merge "Moved data settings to phone" 2018-12-21 02:29:43 +00:00
Calvin Pan
8c758f5ce7 Merge "Rename SIM_APN_LIST to SIM_APN_URI" am: d594716359
am: a49da46d96

Change-Id: Ifa3dd2166fadd7c4fce234adedd6db3df3fcf577
2018-12-20 18:22:01 -08:00
Calvin Pan
a49da46d96 Merge "Rename SIM_APN_LIST to SIM_APN_URI"
am: d594716359

Change-Id: If8708a4d84fd8dce4c7e66507320cd35369331b2
2018-12-20 17:48:19 -08:00
Calvin Pan
d594716359 Merge "Rename SIM_APN_LIST to SIM_APN_URI" 2018-12-21 01:31:44 +00:00
TreeHugger Robot
a09d0fdda2 Merge "Schematize Setup Wizard System Properties" 2018-12-21 01:01:49 +00:00
Fan Zhang
a4da9d78a1 Add GPS to location setting's search keyword
Change-Id: I01d0acbc9f8f212ec899b89b368c3e00f3d177f5
Fixes: 119137548
Test: reindex search
2018-12-20 16:21:46 -08:00
jackqdyulei
2bdefaf68b Remove tests in WifiSettingsUiTest
One is obsolete and one is covered by robo test

Change-Id: I862882c5e1f2f4a7be15b042a8f778a158a9b89c
Fixes: 73796195
Test: atest
2018-12-20 15:55:36 -08:00
Jack Yu
e5accf70fb Moved data settings to phone
Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.

Test: Telephony sanity tests + unit tests
Bug: 73659459
Merged-In: If11a6eff057a18b4aa97addbb348537bd3194e1a
Change-Id: If11a6eff057a18b4aa97addbb348537bd3194e1a
(cherry picked from commit 50972ed89e)
2018-12-20 15:23:11 -08:00
Fan Zhang
1ccecdef94 Remove frictionIconColor attribute
Only 2 drawables need this attr, and they can both point to
colorControlNormal.

Fixes: 121196838
Test: visual - checked display color for wifi badging icons are the same
      in light/dark mode

Change-Id: Ia9555e93ab613fede4fa424460721ec1c7882d2b
2018-12-20 14:34:42 -08:00
Beverly
b9f38af689 Add custom dnd pages for each dnd auto rule
- Fix strings
- Add zen custom settings dialog when custom settings are being applied
Test: make RunSettingsRoboTests -j40
Bug: 111475013
Fixes: 120787133
Fixes: 120796642
Fixes: 120865472
Change-Id: I34d6b4b23d36277e3704416d65e2418418c124e1
2018-12-20 15:06:01 -05:00
TreeHugger Robot
86005a91b3 Merge "Make taps on subscriptions in multi-network header go to mobile page" 2018-12-20 18:59:54 +00:00
Doris Ling
a60cc8ab6e Merge "Update the name of the status bar theme for Theme.Settings.HomeBase." 2018-12-20 18:02:49 +00:00
Antony Sargent
8e57fedc95 Make taps on subscriptions in multi-network header go to mobile page
This CL does 2 things:

-Makes the MobileNetworkActivity class capable of showing details for
 "available" in addition to just "active" networks. This is useful for
 dual-standby devices where one subscription is active and another is
 registered but not currently active. It also changes the title of this
 screen to be the network display name (defaults to the carrier name
 but can be customized by the user) instead of the generic "Mobile
 network".

-Wires up the subscription entries in the multi-network header (which
 only appears when a device has multiple subscriptions) so that taps on
 a subscription preference bring you to the MobileNetworkActivity screen
 to show details for that network.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: I0e985652c1d8ec3c597b6b6e4426d222e2ad5352
2018-12-20 09:03:34 -08:00
pastychang
28fd9b102b Migrating to new footer button for storage migrated pages
Remove unused files storage_wizard_ready.xml and storage_wizard_navigation.xml

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ie3f0023413244dfc2b3f8dddae42977c920e93ac
2018-12-20 22:44:20 +08:00
TreeHugger Robot
88501c6561 Merge "Update owners" 2018-12-20 10:54:23 +00:00