Commit Graph

49754 Commits

Author SHA1 Message Date
Mark Chien
a432a61943 Merge "Support entitlement check in DSDS" 2019-02-12 08:05:11 +00:00
TreeHugger Robot
5999ba5448 Merge "Add carrier settings version to network details page" 2019-02-12 05:01:37 +00:00
TreeHugger Robot
ccdc98e277 Merge "Increase timeout of contextual card pre-check." 2019-02-12 04:38:35 +00:00
TreeHugger Robot
2865b1f07b Merge "Handle simplified Slice deep link intent pattern." 2019-02-12 04:21:34 +00:00
TreeHugger Robot
c5143ceec2 Merge "Add nearby device SlicePreference" 2019-02-12 04:16:26 +00:00
Kiyoung Kim
5e7a15f09a [automerger skipped] Merge "Schematize Display system properties" am: b139a4c16b am: 4d8f4919e0
am: b941bc46b5 -s ours
am skip reason: change_id I83b40ddfcde32d8d03fae73f5c252013933c466c with SHA1 1a3425ed2a is in history

Change-Id: I880ee2758010f1be44e9f24bbc35596fbccea0d8
2019-02-11 19:47:09 -08:00
Kiyoung Kim
b941bc46b5 Merge "Schematize Display system properties" am: b139a4c16b
am: 4d8f4919e0

Change-Id: I35412244d1fa97cb479d060e876bfddac6b523cb
2019-02-11 19:25:50 -08:00
TreeHugger Robot
d9b86280d5 Merge "Fix Wi-Fi DPP fragment back stack problems" 2019-02-12 03:17:57 +00:00
Kiyoung Kim
4d8f4919e0 Merge "Schematize Display system properties"
am: b139a4c16b

Change-Id: I82b157865fb288044c251d6d78ca850b22502db0
2019-02-11 19:13:51 -08:00
Treehugger Robot
b139a4c16b Merge "Schematize Display system properties" 2019-02-12 02:50:08 +00:00
jackqdyulei
ca21544f99 Add nearby device SlicePreference
Change-Id: I9e88602df9ab589c3eea087b1202cbc7615dc810
Fixes: 116327443
Test: RunSettingsRoboTests
2019-02-11 17:38:50 -08:00
TreeHugger Robot
dd1c68b12d Merge "Remove intent-filters from SettingsSliceProvider" 2019-02-12 00:43:03 +00:00
Fan Zhang
f837b899fb Handle simplified Slice deep link intent pattern.
Old intent:
settings://com.android.settings.slices?intent=android-app%3A%2F%2Fcom.android.settings%23Intent%3Baction%3Dcom.android.settings.action.VIEW_SLICE%3BS.slice%3Dcontent%253A%252F%252Fcom.android.settings.slices%252Faction%252Fscreen_magnification_navbar_preference_screen%3B

New intent:
settings://com.android.settings.slices?slice%3Dcontent%253A%252F%252Fcom.android.settings.slices%252Faction%252Fscreen_magnification_navbar_preference_screen%3B

Change-Id: Ia786812c68b5a2b1858203f62494c0d5f5a4a5ba
Fixes: 110156445
Test: manual
2019-02-11 16:25:51 -08:00
TreeHugger Robot
9edcca238b Merge "Don't load anything from contextual card db in legacy mode." 2019-02-12 00:15:25 +00:00
Fan Zhang
671a39f905 Remove intent-filters from SettingsSliceProvider
And remove unused methods from SliceDeepLinkSpringBoard.

This is part 1 of b/110156445

Bug: 110156445
Test: atest
Change-Id: Iab36a97332fd847ed911a9e34b505fd4a64522d3
2019-02-11 15:01:10 -08:00
TreeHugger Robot
00ca556f26 Merge "Create special case mobile data slice" 2019-02-11 22:53:50 +00:00
Antony Sargent
f0d4a3730b Add carrier settings version to network details page
This adds a preference showing the carrier settings version to the
mobile network details page.

Bug: 123995414
Test: make RunSettingsRoboTests
Change-Id: I7b80ead0eadb7375b4404262337e47f75102125c
2019-02-11 14:24:56 -08:00
Fan Zhang
07df08950a Don't load anything from contextual card db in legacy mode.
Change-Id: I2fa1ee78bb8878c2cf46fd2f59499c9ed8eb0a09
Fixes: 124246284
Test: robotest
2019-02-11 13:22:02 -08:00
Lei Yu
7946eee850 Merge "Update search for mobile network settings" 2019-02-11 18:00:57 +00:00
Arc Wang
9d33313735 Fix Wi-Fi DPP fragment back stack problems
1. When a Wi-Fi network connected and receiving
   intent android.settings.PROCESS_WIFI_EASY_CONNECT_QR_CODE,
   show WifiDppAddDeviceFragment from WifiDppConfiguratorActivity
   instead of WifiNetworkListFragment

2. Only handle intent when savedInstanceState is null

3. To show a fragment
   I. do nothing when a fragment is already visible on screen,
   II. pop back stack if it's in back stack, we can do this because
   current fragment transactions are arranged in an order

Bug: 124194531
Test: atest WifiQrCodeTest
      atest WifiDppConfiguratorActivityTest
      atest WifiDppEnrolleeActivityTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest WifiDppQrCodeScannerFragmentTest
      atest WifiNetworkListFragmentTest
      atest WifiDppChooseSavedWifiNetworkFragmentTest

Change-Id: I1d44eeb3bdc7bfb2ec2e4d81efaab64b066651ad
2019-02-11 11:42:21 +08:00
TreeHugger Robot
ad6cc282ee Merge "Remove hardcode class path for CredentialStorage." 2019-02-09 01:47:35 +00:00
jackqdyulei
e6d7d3b1e7 Update search for mobile network settings
This CL make all mobile related preferences support:
1. If subId is manually set, check visibility by subId
2. If not, try find whether there is one active subId meets requirement.
If so, isAvailable() will return true to enable search.

Bug: 77276236
Test: RunSettingsRoboTests
Change-Id: I24e2d2f5e882284ba8e997b844caee7722b6b07d
2019-02-08 16:23:11 -08:00
Lei Yu
9807f99f26 Merge "Add divider line in battery page" 2019-02-09 00:20:35 +00:00
Fan Zhang
4799e54802 Remove hardcode class path for CredentialStorage.
It can launch with a intent action directly.

Change-Id: I26a3a63d1790c1fd184b38711c736428f86f3659
Fixes: 124124110
Test: manual
2019-02-08 15:11:24 -08:00
TreeHugger Robot
607478b663 Merge changes I9185949e,Ia0f15fd7
* changes:
  Remove advanced button from location settings
  Update strings on date & time setting.
2019-02-08 22:41:40 +00:00
TreeHugger Robot
83e6a68743 Merge "Set summary for SIM entries in multi-SIM header" 2019-02-08 22:06:18 +00:00
TreeHugger Robot
c575ef5cb5 Merge "Use system attr instead of hardcoding for searchbar radius" 2019-02-08 21:32:47 +00:00
jackqdyulei
b52ed906cc Add divider line in battery page
Change-Id: Ib5b1d7980cb6c453bb656a36ff6f1bb62bffc803
Fixes: 119618813
Test: Manual
2019-02-08 13:25:31 -08:00
Matthew Fritze
1138218abe Create special case mobile data slice
Build the special case mobile data slice for general use,
and for the Internet Connectivity Panel. The Slice controls
the default data subscription, and links to the subscriptions
page.

Bug: 117804089
Fixse: 119411534
Test: robotests & test app.

Change-Id: I31b524a8fe3182a244d940848090e97250632f39
2019-02-08 13:13:28 -08:00
TreeHugger Robot
01a171b5fb Merge "Import translations. DO NOT MERGE" 2019-02-08 20:57:24 +00:00
Fan Zhang
c7cef5ee43 Remove advanced button from location settings
Change-Id: I9185949edffbc4588287221b81d30e136e755f85
Fixes: 124059127
Test: manual
2019-02-08 12:39:00 -08:00
Antony Sargent
8fc473629a Set summary for SIM entries in multi-SIM header
On the Network & internet page, when you have multiple active SIMs we
add a header with an entry for each one. This CL sets the summary for
those entries to be a 1 or 2 line indication of what services (calls,
SMS, and data) that SIM is used for by default, or just an indication
that the SIM is available. And for the SIM used by default for data, we
include status information about whether it's connected or not.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: I46f37433f753724bbde8876f0d89c3155b2c3812
2019-02-08 20:18:30 +00:00
Fan Zhang
7743e12ce6 Update strings on date & time setting.
Change-Id: Ia0f15fd7e680d6dd864567a31186b7e2090c435f
Fixes: 123812588
Test: visual
2019-02-08 11:24:15 -08:00
Fan Zhang
d48a65c44d Use system attr instead of hardcoding for searchbar radius
Change-Id: I41aa10b7fc13271e2d9369fe4dc4e1808a0c1044
Fixes: 123985440
Test: visual
2019-02-08 11:19:13 -08:00
Julia Reynolds
7d257171dc Merge "Fix failing test" 2019-02-08 17:53:43 +00:00
Julia Reynolds
d8629c5ebb Fix failing test
Test: robo tests
Change-Id: Ic4c927948b3c91a126ab830960e12550a5fd80fa
Fixes: 124077441
2019-02-08 10:49:11 -05:00
TreeHugger Robot
d9d6acf1fd Merge "Logging SetNewPasswordActivity events" 2019-02-08 13:59:19 +00:00
Bill Yi
624dca2afe Import translations. DO NOT MERGE
Change-Id: Id12a885466480f418f45a1b6e881477771a4b86a
Auto-generated-cl: translation import
2019-02-08 01:07:35 -08:00
TreeHugger Robot
c621a5517e Merge "Fix broken tests." 2019-02-08 05:10:48 +00:00
TreeHugger Robot
2aa5a8adf1 Merge "Use correct default subscription id to get default network template." 2019-02-08 04:09:00 +00:00
Joel Galenson
a330abba0a Fix broken tests.
This test was passing in invalid values for the namespace and key.
Modify it to use the correct ones.

Change-Id: Idc6971c20d64b711953bdde9fe710f592b04e807
Fixes: 124077137
Test: atest VibrateWhenRingPreferenceControllerTest
2019-02-07 19:36:21 -08:00
Doris Ling
dddeb5f25e Use correct default subscription id to get default network template.
- when launching the app info page and no network template is defined in
the launch arguments, use the correct default data subscription id to
check whether mobile network template should be used or not.

Change-Id: If9341abf3416c775a2b7407c1d6d0b33f4aad67f
Fixes: 120098637
Test: make RunSettingsRoboTests
2019-02-07 14:41:45 -08:00
TreeHugger Robot
d2e7bfeb1c Merge "Update strings" 2019-02-07 22:29:40 +00:00
Fan Zhang
5b27d18e38 Update strings
Change-Id: Idbf1e3a8b0c7116271e424548ef37340199eaea2
Fixes: 124049901
Test: manual
2019-02-07 11:53:59 -08:00
TreeHugger Robot
6e54c774be Merge "Revert "Update proguard"" 2019-02-07 17:42:47 +00:00
TreeHugger Robot
16d8f7087a Merge "Fix mobile data on/off switch for multi-sim case" 2019-02-07 16:51:02 +00:00
Christine Franks
6f7b68ca62 Merge "Use ColorDisplayManager for night display settings" 2019-02-07 16:11:14 +00:00
Xiangyu/Malcolm Chen
09f76a0298 Merge "Enable data when user selects default data through popped up dialog." 2019-02-07 03:34:14 +00:00
TreeHugger Robot
175b7b9256 Merge "Retrieve effectiveUserId after userId is set/re-set" 2019-02-07 02:01:21 +00:00
TreeHugger Robot
b6db082fd4 Merge "Merge bool.xml and config.xml into one file." 2019-02-07 00:16:30 +00:00