Commit Graph

56144 Commits

Author SHA1 Message Date
Bonian Chen
73e6ec3231 Merge "[Settings] Create a proxy for SubscriptionManager"
am: b2380eaaee

Change-Id: Ib66ad2735d01dc3f918ffbd133fcbe5d006bb85f
2019-12-18 01:07:43 -08:00
Bonian Chen
b2380eaaee Merge "[Settings] Create a proxy for SubscriptionManager" 2019-12-18 09:04:53 +00:00
Yoshiaki Naka
81dbc00b6e Retrieve EID from each card
Each eUICC has its own EID. The same EID retrieved from the default
eUICC shall not be displayed for all the SIM status dialogs when the
device supports multiple UICCs.

Bug: 141256483
Test: Manual and SimStatusDialogControllerTest

Change-Id: I367ae3a5f97ff92e03312bed6fe37727ae3798ab
2019-12-18 17:57:47 +09:00
Automerger Merge Worker
a07760377e Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev am: 30bf9e2e5e
Change-Id: Iacdac6e3fc2f8ba03f5cd3a590f52c5c990e1226
2019-12-18 06:27:02 +00:00
android-build-team Robot
6b7081154a Merge cherrypicks of [9943992, 9944684, 9944054, 9943993, 9944476, 9942363, 9942364, 9942365, 9942367, 9944685, 9944686, 9943217, 9944762, 9944764, 9944481, 9944411, 9944055, 9944056, 9944057] into qt-qpr1-release
Change-Id: I79028754f4eb72b297e36d3bb43927d98b652e52
2019-12-18 06:24:31 +00:00
Mill Chen
36bbb02dca Prevent accounts page directly opening in screen pinning mode
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab35)
(cherry picked from commit a545a85f9d)
2019-12-18 06:24:03 +00:00
Kevin Chyn
30bf9e2e5e Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev 2019-12-18 06:15:58 +00:00
joshmccloskey
2e57bc47b2 Added horizontal seperator in Face Settings
Test: Manual.
Bug: 140965037
Change-Id: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
Merged-In: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
2019-12-18 04:54:27 +00:00
Automerger Merge Worker
98a0e0ec96 Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev am: 5b71fccabd
Change-Id: If7bce1789dd81d3f77766fd9ed71dbc6738fb857
2019-12-18 02:46:11 +00:00
TreeHugger Robot
5b71fccabd Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev 2019-12-18 02:27:28 +00:00
android-build-team Robot
1ab7ff2819 Snap for 6079367 from 8472279900 to qt-qpr2-release
Change-Id: I6bdca3512b6e6a7fe45c202526a2a760b71add12
2019-12-18 02:19:43 +00:00
Automerger Merge Worker
0ed1383af2 Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" am: ecce39622d am: 2be27a8d81
Change-Id: Ia5c3e5043d885812fa013caa7b0786819ec81e5c
2019-12-18 01:53:32 +00:00
SongFerng Wang
2be27a8d81 Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech"
am: ecce39622d

Change-Id: I4eb6b4e980a13b5b6fc164b7f7edbd7b9fb059d3
2019-12-17 17:41:21 -08:00
SongFerng Wang
ecce39622d Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" 2019-12-18 01:36:08 +00:00
Sarah Chin
f123f98510 Handle 5G meteredness in telephony framework
Edit onSubscriptionOverride method for NetworkPolicyListener

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests

Change-Id: Ided2e445d3758ebc6c4f4df63145f61f9a56f64e
Merged-In: Ided2e445d3758ebc6c4f4df63145f61f9a56f64e
(cherry picked from commit 2136bc92fe)
2019-12-17 23:16:19 +00:00
SongFerngWang
c13da87416 [mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech
Bug: 146314969
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest

Change-Id: I1e9eeab9d886a2910c7db8b59cfe267c51c5920c
Merged-In: I1600a96a729fc3b555eab5bc80b069663c8eb00a
2019-12-17 12:19:52 +00:00
Automerger Merge Worker
96c32711b8 Merge "Fix volume slider color is not correct" am: d1489d2f1f am: 9bb1c631ae
Change-Id: I66e7bb3c06891d092d6ec4b49372ab977670beee
2019-12-17 09:22:59 +00:00
Raff Tsai
9bb1c631ae Merge "Fix volume slider color is not correct"
am: d1489d2f1f

Change-Id: I6d638ec272cfac5be07e817bbac8c287896fdc4d
2019-12-17 01:04:45 -08:00
Raff Tsai
d1489d2f1f Merge "Fix volume slider color is not correct" 2019-12-17 08:46:46 +00:00
Raff Tsai
37860d4299 Fix volume slider color is not correct
Fixes: 140990940
Test: 1. Switch to dark theme
      2. adb shell am start -a android.settings.panel.action.VOLUME
      3. check volume slider color is identical to color in "Done"
      4. Switch to light theme
      5. adb shell am start -a android.settings.panel.action.VOLUME
      6. Check volume slider color is identical to color in "Done"

Change-Id: If783d5c5f8604a23cfaaa28cf42b916763f9c9e8
2019-12-17 14:34:29 +08:00
Automerger Merge Worker
619d8b3418 Merge "Add feature provider for face unlock" into qt-qpr1-dev am: 8472279900
Change-Id: I3334a10c25af3b5a8ed125495c7012fe46516485
2019-12-17 05:38:36 +00:00
Kevin Chyn
8472279900 Merge "Add feature provider for face unlock" into qt-qpr1-dev 2019-12-17 05:27:01 +00:00
Automerger Merge Worker
1bacc5697b Merge "[Settings] Suspend some test case(s)" am: a70e45b03c am: 9bd271763e
Change-Id: Iecbace1215fa4c150a44cc462c7157bc044250f4
2019-12-17 03:37:08 +00:00
Bonian Chen
9bd271763e Merge "[Settings] Suspend some test case(s)"
am: a70e45b03c

Change-Id: Icaddf7a6f31d938af3f4a748f81c4890dc06fd52
2019-12-16 19:06:42 -08:00
Bonian Chen
a70e45b03c Merge "[Settings] Suspend some test case(s)" 2019-12-17 02:37:15 +00:00
Kevin Chyn
15f241b296 Add feature provider for face unlock
Bug: 146085546

Test: Builds
Change-Id: If5c7d57c12a3f679d81cee22fb94a53fce1de29a
2019-12-16 18:19:20 -08:00
Automerger Merge Worker
1cd39a3fb9 Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev am: 58bffb7f71
Change-Id: I2b25e18e176a7399ce4c7149a87b2014fceecb69
2019-12-16 21:55:09 +00:00
Automerger Merge Worker
34c41cdadb [DO NOT MERGE] Add country blacklist support am: d4420d4ce4
Change-Id: I2924df987a2a0efc9e4f9f9f2e2fd838ed01f19d
2019-12-16 21:54:11 +00:00
Alex Lin
58bffb7f71 Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev 2019-12-16 21:34:45 +00:00
Alex Lin
62487aed51 Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev-plus-aosp 2019-12-16 21:34:45 +00:00
Automerger Merge Worker
0419bccadc Merge "[Settings] Remove access of TelecomManager.from()" am: 90544355cd am: 0871f6bc97
Change-Id: I992dfff13cca63e070a74066a78b53fb8fefe01d
2019-12-16 14:23:54 +00:00
Bonian Chen
0871f6bc97 Merge "[Settings] Remove access of TelecomManager.from()"
am: 90544355cd

Change-Id: I4fe4009ffd33e2610d0c4bc8382ae8534c07a661
2019-12-16 06:12:53 -08:00
Treehugger Robot
90544355cd Merge "[Settings] Remove access of TelecomManager.from()" 2019-12-16 13:04:24 +00:00
Bonian Chen
3a96d214d3 [Settings] Remove access of TelecomManager.from()
Replace TelecomManager.from() into public API access.

Bug: 146187127
Test: build pass
Change-Id: Id9fa32063a9a7ea5b9107315e50330fa5eca41b7
2019-12-16 08:48:05 +00:00
Bonian Chen
911b6e4b3b [Settings] Suspend some test case(s)
Some test cases generate error on reports.
Suspend these test cases and further study before re-enabling them.

Bug: 146314533
Test: build pass
Change-Id: If27575960d9e1501df4c02ba5690f99e120bb1b1
2019-12-16 08:37:27 +00:00
Bonian Chen
74c6ceed24 [Settings] Create a proxy for SubscriptionManager
There're many access from Settings app to SubscriptionManager.
Lots of them are checking for similar information.
Create a proxy can reduce the number of inter-process access from
Settings app to SubscriptionManager, and improve Settings app's
UI performance.

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=GlobalSettingsChangeListenerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Change-Id: I3591c478045500a97245955767a7ddd5d361da77
2019-12-16 16:26:40 +08:00
Automerger Merge Worker
11fa77b023 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d
Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c
2019-12-16 08:15:54 +00:00
Automerger Merge Worker
b4fd6cf8c9 Merge "[Setting] Code cleanup" am: 126df6441b am: 9d556441b4
Change-Id: I956cb317ec98a5f6e9083b46f949451cf7e84613
2019-12-16 08:15:03 +00:00
Bonian Chen
40d2a2dd8d Merge "[Settings] Adopting public API"
am: 8ddd0da0a1

Change-Id: I484a14670ee624624529f30af85ba0bfb06ae742
2019-12-16 00:05:51 -08:00
Bonian Chen
9d556441b4 Merge "[Setting] Code cleanup"
am: 126df6441b

Change-Id: I899c46a6b7df425a0ebfd22965c90bd304627edb
2019-12-16 00:03:22 -08:00
Bonian Chen
8ddd0da0a1 Merge "[Settings] Adopting public API" 2019-12-16 07:56:04 +00:00
Bonian Chen
126df6441b Merge "[Setting] Code cleanup" 2019-12-16 07:26:48 +00:00
Bonian Chen
1247771b88 [Settings] Adopting public API
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.

Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
2019-12-16 06:35:43 +00:00
Bonian Chen
493dbc7aa7 [Setting] Code cleanup
Remove unused code.

Bug: 146309503
Test: build pass
Change-Id: I272ef1fa82877c8ac6b580fadd8d9baf1da2d5d4
2019-12-16 10:53:11 +08:00
android-build-team Robot
98b239e370 Snap for 6074232 from ee2c5a9df9 to qt-qpr2-release
Change-Id: I73a60eacd3fcfb8cb86662de27105856f7b3ed0f
2019-12-16 00:15:26 +00:00
Automerger Merge Worker
e18163b175 [automerger skipped] Import translations. DO NOT MERGE am: ee2c5a9df9 -s ours
am skip reason: subject contains skip directive

Change-Id: I708fe77de9b914609d00b208c0b1d3851273f9be
2019-12-15 05:34:42 +00:00
Bill Yi
ee2c5a9df9 Import translations. DO NOT MERGE
Change-Id: I97d06e305b91ed0cffb8282e2610711d6c4d1d38
Auto-generated-cl: translation import
2019-12-13 21:28:00 -08:00
Automerger Merge Worker
00d32abf06 Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a am: 74a7a3cfb2
Change-Id: I02216936cd583e0a9a015287decdcb9f849ca45c
2019-12-14 01:23:03 +00:00
Bonian Chen
74a7a3cfb2 Merge "Revert "[Setting] Cleanup Unused SimSettings""
am: 487c94c11a

Change-Id: I216047b915cbfb72eaf5de497709152fd8fee479
2019-12-13 17:09:45 -08:00
Automerger Merge Worker
cc63645bb2 Merge "[RadioInfo] Remove from Settings (into Telephony)" am: 0aac2dfab6 am: cfb6e23b21
Change-Id: I8c589476f6f365c2695bbacb026beebc4ea1c8db
2019-12-14 01:04:19 +00:00