Commit Graph

48239 Commits

Author SHA1 Message Date
jackqdyulei
2c0861e61b Remove AdvancedOptionsPreference
This is used to show "Advanced" preference in telephony package.
Remove it since we have better way to do it in settings.

Bug: 114749736
Test: Manual
Change-Id: I3008bf856b8f42ba10ab26cb81d35a9370601c58
2018-10-08 11:12:03 -07:00
jackqdyulei
106ae1d742 Add activity for mobile network page
1. Extract the Tabhost to activity level, not fragment level. So
each mobile fragment has a constant subscriptionId
2. Use BottomNavigationView instead of TabHost

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I43aebf2ec01a945697c6b2302ab750e715e4bfef
2018-10-08 11:00:35 -07:00
jackqdyulei
38f872fa1f Fix the complie error of network migration
1. Fix the error in import part
2. Remove broken code and add TODO

Future CL will fix TODO and add tests

Bug: 114749736
Test: Build
Change-Id: I4fda0708959e299015ecb10ac17c9c2dadc6f852
2018-10-08 10:44:38 -07:00
Doris Ling
77f7bf675c Merge "Fix typo in getHistoriclUsageLevel()" 2018-10-08 17:24:37 +00:00
Mill Chen
f4a785cec7 Add device info slice in Contextual Settings Homepage
- Add device info card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for device info slice.

Bug: 114790594, 115971399
Test: robotests, manual, SliceBrowser
Change-Id: I627a5b442e6ee20b3fd2e0500b31921bfec7b1d3
2018-10-08 20:20:23 +08:00
tmfang
0d07dd19d0 Use custom drop-down filter widget
This CL is just a example how to use this SettingsSpinner.

Change-Id: Ie0d104ce5f3e4c6b852fe7c051253b1567c6c4cd
Fixes: 112706966
Test: robotests
2018-10-08 16:23:52 +08:00
Bill Yi
93c86ab1b6 Import translations. DO NOT MERGE
Change-Id: I97ae0a1863b5a8208b4784e10ee1422e010928c8
Auto-generated-cl: translation import
2018-10-06 21:32:01 -07:00
Sooraj Sasindran
6607361db7 Merge "Use updated APIs for CBRS" 2018-10-06 03:41:26 +00:00
TreeHugger Robot
ebb83a3953 Merge "Fix work profile fingerprint userId" 2018-10-05 23:59:52 +00:00
Doris Ling
d9663b7822 Fix typo in getHistoriclUsageLevel()
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I523e43f60948e49e78d518a4eeb3ed2bf885f7bd
2018-10-05 14:22:07 -07:00
Maurice Lam
446637e583 Ignore lock type in ChooseLockGeneric in non-FBE
We need to show the encryption opt-in in non-FBE cases.

Test: atest RunSettingsRoboTests
Bug: 115847373
Change-Id: I3a92b265c9c8ecf5d4af009943b5b9483e25a738
2018-10-05 13:30:55 -07:00
Beverly
833119a4e2 Allow DND events rule to choose custom calendars
For the System DND Events rule, users can now select
custom calendars they are contributors to that are
synced to their device.

Test: atest /extra/master/packages/apps/Settings/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
Bug: 113368047
Change-Id: I1b81c528655b8f68867d881cee8125aa2b027eaa
2018-10-05 14:58:00 -04:00
Kevin Chyn
2e50c32c80 Fix work profile fingerprint userId
Fixes: 117303349

Test: Enabling work profile, FP settings shows independent sets again
      (same as P behavior)

Change-Id: Ifddd41c8aaa4316a58c9b8d16905d6d05318f5fd
2018-10-05 11:23:59 -07:00
TreeHugger Robot
de5dbf1a3e Merge "Get ethernet data usage from NetworkStatsManager." 2018-10-04 20:00:19 +00:00
Doris Ling
ab9c9e4df9 Get ethernet data usage from NetworkStatsManager.
- change to use NetworkStatsManager.querySummaryForUser() to check for
ethernet usage data instead of getting it from INetworkStatsSession.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I60364b4a5f7879906beba194c50955154d56803a
2018-10-04 10:15:44 -07:00
Lei Yu
220b11b0f3 Merge "Still check the visibility of view" 2018-10-04 17:08:58 +00:00
Niklas Lindgren
8fdf33d50a Start using CarrierConfig for 4G/LTE icon
Icon will be updated on sim swap or in case
the default data SIM changes.

Test: Add configs in vendor xml and swap between sim cards.
Tested on both single sim and dual sim.
Bug: 113309356
Change-Id: I1847bcb4e6c1b6dcef7b14bce14f91bd3e4734a5
2018-10-04 09:42:27 +02:00
Chienyuan
03f2d1e55d Merge "Don't set value when developer options disabled" am: 692f5368d0 am: 5ef8843845
am: 4f7895f08b

Change-Id: I688e3dfee47ead666e93d8b5a42ad88a49259d65
2018-10-03 20:02:10 -07:00
Chienyuan
4f7895f08b Merge "Don't set value when developer options disabled" am: 692f5368d0
am: 5ef8843845

Change-Id: Idb3c130e31571111911b4e17d989b1199ff7619a
2018-10-03 19:57:57 -07:00
Chienyuan
5ef8843845 Merge "Don't set value when developer options disabled"
am: 692f5368d0

Change-Id: Icddab4eb38cade9d111e39a0e2dfee24198aabc0
2018-10-03 19:48:47 -07:00
Treehugger Robot
692f5368d0 Merge "Don't set value when developer options disabled" 2018-10-04 02:28:42 +00:00
jackqdyulei
bff33e170c Copy MobileNetworkSettings to settings app
This is a CL to copy most components from telephony to settings app with
following changes to pass the preupload check:
1. Add [CHAR LIMIT]/comments for strings that miss them

This CL cannot build and future CL will fix the broken part.

Bug: 114749736
Test: Build
Change-Id: I744d537610eeeb7f2fb801defdd0ce47ef6088b6
2018-10-03 18:05:15 -07:00
TreeHugger Robot
633650969a Merge "Add PreferenceController for support tile in homepage." 2018-10-03 22:46:56 +00:00
Fan Zhang
dd5828c054 Add PreferenceController for support tile in homepage.
Change-Id: I8fe93456a761382513c07ff85c858ded30f599fc
Fixes: 116875332
Test: robotests
2018-10-03 13:35:12 -07:00
TreeHugger Robot
414c212909 Merge "Change reset page to be SUW style" 2018-10-03 20:29:45 +00:00
Doris Ling
3c5850ee62 Use the new loader to show app data usage details.
- this is for showing the detail usage (total, background, and
foreground) for a specific app for each billing cycle.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I8e02872a4204b682089ea117811b50966e785c55
2018-10-03 19:49:22 +00:00
Lei Yu
4b2a053bed Merge changes I44039704,Iee0de8a2
* changes:
  Use isConnected in CachedBluetoothDevice
  Update "Previous connected device" preference
2018-10-03 19:04:16 +00:00
felkachang
a6cec47326 Change reset page to be SUW style
The factory reset page and the reset confirmation page is too old to
follow the style of Setup Wizard design. To change the layout and apply
the style for textviews and header.

Bug: 73738836
Test: make -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I1ee3d09e1ef9cac8e25c60a566363d4f7d537eeb
2018-10-03 11:45:49 -07:00
TreeHugger Robot
031de928a5 Merge "Delete provider data before insert" 2018-10-03 17:01:23 +00:00
Chienyuan
84f2ee6eff Don't set value when developer options disabled
We shouldn't change property when developer options disabled.
Change A2DP HW offload property without reboot, A2DP will not work.

Bug: 109717129
Test: manual
Change-Id: I96103b04922b28995be198badbed324de40624f0
2018-10-03 21:04:19 +08:00
Neil Fuller
a6ba19618f [automerger skipped] Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" am: a934366a8d am: 8caeafdf92
am: eae7538909  -s ours

Change-Id: Ibebf9810795cc9b87bcfdcc123d9f8b360260986
2018-10-03 00:36:19 -07:00
Neil Fuller
eae7538909 Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" am: a934366a8d
am: 8caeafdf92

Change-Id: I9dcfcf4414837d32a42abc152a49fb4544ddac80
2018-10-03 00:32:10 -07:00
Neil Fuller
8caeafdf92 Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
am: a934366a8d

Change-Id: If44a79fde1e2694dc24d09cbf889771facef751f
2018-10-03 00:26:56 -07:00
Neil Fuller
a934366a8d Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" 2018-10-03 07:13:37 +00:00
Sunny Shao
10f519347a Delete provider data before insert
- Updated CardContentProvider and deleted exist data first to avoid redundant insertion in bulkInsert

Bug: 115575311
Test: robotest
Change-Id: I58b7b26f18bfdb8a59ebc61d7abb478390c58e4c
2018-10-03 11:01:04 +08:00
TreeHugger Robot
5cb7e3c0ab Merge "Use the new loader to show app data usage summary." 2018-10-03 01:30:40 +00:00
Stanley Tng
477cd15221 [automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev-plus-aosp
am: ce939610ba  -s ours

Change-Id: Icb817e909ee7f66f8b8f53c8e3572354845167a9
2018-10-02 18:05:04 -07:00
Stanley Tng
ef2ae4d7e3 [automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev am: 31703ca227 -s ours
am: 0eb58d6f55  -s ours

Change-Id: I8c89ec79c91605b43a073dbbe225b828bd2fdd35
2018-10-02 17:35:11 -07:00
TreeHugger Robot
09b181c771 Merge "Set the layoutPreference not selectable" 2018-10-03 00:23:42 +00:00
TreeHugger Robot
ce939610ba Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev-plus-aosp 2018-10-03 00:04:45 +00:00
Stanley Tng
0eb58d6f55 [automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
am: 31703ca227  -s ours

Change-Id: Icaa20e177b9037291b4c9fc03466b692618e95e8
2018-10-02 16:46:58 -07:00
TreeHugger Robot
3f45adfeb1 Merge "Check instance before casting" 2018-10-02 23:41:35 +00:00
Doris Ling
b758e2b473 Use the new loader to show app data usage summary.
- this is for getting the summary text for Apps & notifications ->
(select an app) -> Mobile data & Wi-Fi

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: Ib4d8e7308ea8a782b9af3bbb99db2b1235e0aca2
2018-10-02 16:21:14 -07:00
jackqdyulei
8800b9e1ff Use isConnected in CachedBluetoothDevice
This method check whether it has connected profile, not physical
connection between devices.

It make more sense to use it in settings:
1. We only care about whether it has active profile(i.e. A2dp, hfp..)
2. Sometime when profile is disconnected, BluetoothDevice.isConnected()
still return true. This may make UI flaky.

Bug: 79947085
Test: RunSettingsRoboTests
Change-Id: I44039704508a742c7a8aef0a035afcf169b08939
2018-10-02 15:55:21 -07:00
jackqdyulei
184b3a4c68 Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API

Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.

Bug: 115707279
Test: RunSettingsRoboTests
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-02 15:41:46 -07:00
Fan Zhang
53bdd9961c Check instance before casting
Change-Id: I1917b2d8e045904145ea833abf35fa1d008fa224
Fixes: 116855783
Test: robotests
2018-10-02 15:15:38 -07:00
Stanley Tng
7b91f0dd3e Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Bug: 116725094
Bug: 117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.

Change-Id: I5c9af9ec6a2a17668597a537fd1f7b70368b7ed8
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-02 15:10:43 -07:00
TreeHugger Robot
54e4100ac0 Merge "Add SettingsContextualCardProvider" 2018-10-02 21:18:46 +00:00
TreeHugger Robot
31703ca227 Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev 2018-10-02 20:30:17 +00:00
Hansong Zhang
407823251b Fix build
am: 78ab907aa6

Change-Id: Ia036fde5adb3a8f060f5d0977147297f5a2f1489
2018-10-02 12:44:14 -07:00