Bonian Chen
f121495e69
Merge "[Settings] Remove Phone hidden constants access"
2020-01-16 20:12:27 +00:00
Automerger Merge Worker
142e9a1e19
[automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: db6915778e
am: b3bc4cf8f6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iefa8d9e81b087acc374042917919731b300eed68
2020-01-16 19:11:52 +00:00
Automerger Merge Worker
4358f0d6ed
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ccbee6a795
am: 0ad2bf17b6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Icaf54b4d21bb8df029b33347595dc7fb86fd8301
2020-01-16 19:01:06 +00:00
Automerger Merge Worker
b3bc4cf8f6
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: db6915778e
...
Change-Id: I83b8e2a547b91bbc577f7827f778f4d06ee07847
2020-01-16 18:54:45 +00:00
Automerger Merge Worker
0ad2bf17b6
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ccbee6a795
...
Change-Id: Ie97ffd800d66e21d10d47a9b4a89683f71fb1816
2020-01-16 18:34:46 +00:00
TreeHugger Robot
db6915778e
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master
2020-01-16 18:29:15 +00:00
Menghan Li
f70d04ea0a
Merge "Create palette preview for color correction (2/n)."
2020-01-16 15:12:26 +00:00
TreeHugger Robot
5f964f1886
Merge "Remove settings_work_profile feature flag"
2020-01-16 15:10:17 +00:00
SongFerng Wang
5f4fadb949
Merge "Mainline: removed legacy UI for network selection mode."
2020-01-16 14:27:25 +00:00
TreeHugger Robot
bc6bd74228
Merge "Color correction improvement (4/n)"
2020-01-16 14:24:46 +00:00
TreeHugger Robot
7fd5b23da4
Merge "Accessibility shortcut secondary action - fix magnification triple tap logic"
2020-01-16 14:22:55 +00:00
TreeHugger Robot
244afa02d2
Merge "Revert "Settings search - Navigate user to exact page""
2020-01-16 13:06:24 +00:00
Bonian Chen
4ecff2c833
[Settings] Remove Phone hidden constants access
...
Remove access to:
1. Phone.CDMA_SUBSCRIPTION_UNKNOWN
2. Phone.PREFERRED_NT_MODE
3. Phone.PREFERRED_CDMA_SUBSCRIPTION
Bug: 147794713
Test: manual
Change-Id: I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38
2020-01-16 13:05:33 +00:00
Automerger Merge Worker
50d20369ae
[automerger skipped] Import translations. DO NOT MERGE am: 250b9e7012
-s ours am: 90cb40e80c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0c32b44c220d21e85ab1cc26b467defc9e56beec
2020-01-16 11:49:41 +00:00
Automerger Merge Worker
90cb40e80c
[automerger skipped] Import translations. DO NOT MERGE am: 250b9e7012
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id9a1fd209c07f005d5d325a54fb159e7cd282b1e
2020-01-16 11:33:44 +00:00
TreeHugger Robot
81d194ed7a
Merge "Make contextual card count configurable."
2020-01-16 11:21:38 +00:00
SongFerngWang
affe5406a6
Mainline: removed legacy UI for network selection mode.
...
This cl base on ag/10098777. Now inserted inactive pSIM
will be included in Telephony's get available and
get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: build pass
Change-Id: I1a0f431f05268d29afce145c3eb720594cfc57a3
2020-01-16 10:55:46 +00:00
Automerger Merge Worker
be9bd728c7
[automerger skipped] Merge "Remove reference of PhoneConstant." am: 6f82fe83f0
am: 83e2fa8b03
am: fcfcf4380b
-s ours
...
am skip reason: Change-Id I22b85799ad547aca1ce4e63af3f39bc7f29618c6 with SHA-1 25f1de88dd
is in history
Change-Id: Iea63d74c38fa146aecb3ac6d1ed1e6686b398146
2020-01-16 10:33:49 +00:00
TreeHugger Robot
dc6e5ffe5f
Merge "Import translations. DO NOT MERGE"
2020-01-16 10:31:32 +00:00
jasonwshsu
620aec5f8c
Accessibility shortcut secondary action - fix magnification triple tap logic
...
- triple tap in settings is boolean status, not string.
Bug: 142530063
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: Ieec9879f7ef55b694245c6f9143575ba933855e5
2020-01-16 18:21:48 +08:00
Automerger Merge Worker
fcfcf4380b
Merge "Remove reference of PhoneConstant." am: 6f82fe83f0
am: 83e2fa8b03
...
Change-Id: I52bd36fa7085f1915bf4be102af24c1269c1d317
2020-01-16 10:19:58 +00:00
Lee Chou
ee4ffce3aa
Ignoring SubscriptionUtilTest [Settings]
...
Changes in the framework ag/10100601 broke this test, ignoring for now
Bug: 147791865
Test: m RunSettingsRoboTests
Change-Id: If2568154c5a767baebf51f95956f499b748a55bd
2020-01-16 18:13:24 +08:00
Bonian Chen
83e2fa8b03
Merge "Remove reference of PhoneConstant."
...
am: 6f82fe83f0
Change-Id: Id1122118bf76d3594710fc97908f3b0ac06604ac
2020-01-16 02:08:17 -08:00
menghanli
35931974eb
Create palette preview for color correction (2/n).
...
Limit the preview measure for one time to avoid unnecessary
measure and draw performance.
Bug: 145968068
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PaletteListViewTest
Test: make RunSettingsRoboTests2
Change-Id: Ib8ea13e511351c71babcbd1376817cea3a47cac4
2020-01-16 17:55:52 +08:00
Bonian Chen
6f82fe83f0
Merge "Remove reference of PhoneConstant."
2020-01-16 09:17:01 +00:00
Yi-Ling Chuang
72da4a81f4
Make contextual card count configurable.
...
Decide how many card we should show at once on the homepage based on the
value in Settings Global for more flexibility. Fall back to the default
value if there is nothing set up.
Bug: 138754406
Test: robotests
Change-Id: I8d31d98eafb636a5e72af76ffec7e3dae0be3cbc
2020-01-16 16:20:56 +08:00
Lee Chou
0d6e26a9b8
Merge "removed Network Operator Preference Test"
2020-01-16 08:19:17 +00:00
Jason Hsu
565b1f031a
Merge "Accessibility shortcut secondary action - correct invisible type fragment checkbox logic"
2020-01-16 07:52:07 +00:00
Edgar Wang
e19ee9a01f
Revert "Settings search - Navigate user to exact page"
...
This reverts commit 08f2a58459
.
Reason for revert: design changed, we decide to take the user to
the entry after clicking on a search result.
It's opposite with what we did, so we revert related CL first.
Test: robotest
Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
2020-01-16 14:07:38 +08:00
Lee Chou
80e89e1995
removed Network Operator Preference Test
...
the legacy UI was removed in ag/10050039
this commit removes the corresponding test file
Bug: 147784139
Test: m RunSettingsRoboTests
Change-Id: I2200fa407fe0e807338eb5da01a60c70016170a1
2020-01-16 13:57:40 +08:00
Raff Tsai
3fbdf34a03
Remove settings_work_profile feature flag
...
Bug: 141601408
Test: robolectric
Change-Id: Ib7ef6794405fef6336690115680cf95b0e4c1542
2020-01-16 13:56:52 +08:00
Xiangyu/Malcolm Chen
69a7e054f5
Merge "Remove logic to manually search inactive pSIM."
2020-01-16 04:24:34 +00:00
Bill Yi
250b9e7012
Import translations. DO NOT MERGE
...
Change-Id: If28324d88c5dabf515e6ce440d4816b185a39a00
Auto-generated-cl: translation import
2020-01-15 20:22:42 -08:00
Bill Yi
9a6dcd2eaf
Import translations. DO NOT MERGE
...
Change-Id: I40ca1052c54e91f5de8fc81d052f397bcd7aea75
Auto-generated-cl: translation import
2020-01-15 19:56:31 -08:00
menghanli
cb718d7d25
Color correction improvement (4/n)
...
Integrate with the multiple shortcut selections and change the behavior as below:
- Register a setting content observer to monitor the service on/off
status to update switch toggle UI.
Bug: 145968068
Test: make RunSettingsRoboTests2
Change-Id: Ib195aab720d965a7a3047070999783fe9525bfd9
2020-01-16 10:35:42 +08:00
Xin Li
ccbee6a795
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: I77344517b74a2192af49a3f8956d8756b81741d9
2020-01-15 15:57:20 -08:00
Automerger Merge Worker
d2fe041281
Merge "[Settings] Remove unused ImsStatusPreferenceController" am: b36f57ae5a
am: 4a16d794e8
am: 40bd05a1b9
...
Change-Id: Ifb92c6944769ee58d45e16f6a9bde870c23bf27e
2020-01-15 23:32:17 +00:00
Automerger Merge Worker
40bd05a1b9
Merge "[Settings] Remove unused ImsStatusPreferenceController" am: b36f57ae5a
am: 4a16d794e8
...
Change-Id: I2f2a31f5dff7b3b22794152d774e664569b2a2d8
2020-01-15 23:22:36 +00:00
Bonian Chen
4a16d794e8
Merge "[Settings] Remove unused ImsStatusPreferenceController"
...
am: b36f57ae5a
Change-Id: I564cb43149136f5913877497abc256a19adf02b3
2020-01-15 15:08:44 -08:00
Malcolm Chen
640e56433f
Remove logic to manually search inactive pSIM.
...
Nowe inserted inactive pSIM will be included in Telephony's get
available and get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: unittest
Change-Id: Icd131f133e47dae0770a4da71c51de3c2a94b42b
2020-01-15 14:58:07 -08:00
Bonian Chen
b36f57ae5a
Merge "[Settings] Remove unused ImsStatusPreferenceController"
2020-01-15 22:46:00 +00:00
Etan Cohen
903f933356
Merge "[DPP] Fix intent dispatching"
2020-01-15 19:38:56 +00:00
TreeHugger Robot
08957569be
Merge "Tie new category key to the adaptive battery settings page."
2020-01-15 17:47:55 +00:00
Etan Cohen
245ced4b78
[DPP] Fix intent dispatching
...
Bug: 139381558
Test: verified with test app WifiEasyConnect.apk
Change-Id: If0588695b591e7ba5ba664586813c4a264a9779e
2020-01-15 17:43:14 +00:00
Automerger Merge Worker
ee683a4a73
Merge "[Settings] Replacing accessing of PhoneConstants$DataState" am: e9324b48ab
am: 96e43012a1
am: dc5b5a0000
...
Change-Id: I8dbc15bb01fc815aa9cde6fe332903d4166289e9
2020-01-15 15:27:58 +00:00
Automerger Merge Worker
dc5b5a0000
Merge "[Settings] Replacing accessing of PhoneConstants$DataState" am: e9324b48ab
am: 96e43012a1
...
Change-Id: I82f77b82685111e05235e8b4bdc03efe469c23bc
2020-01-15 15:13:09 +00:00
Bonian Chen
96e43012a1
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
...
am: e9324b48ab
Change-Id: I972571956394d81619edae2a0450dd36a68b0236
2020-01-15 07:02:18 -08:00
Bonian Chen
e9324b48ab
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
2020-01-15 14:56:36 +00:00
Bonian Chen
58ed9710c7
Remove reference of PhoneConstant.
...
Copy constants to ApnEditor from PhoneConstant
Test: make
Test: m RunSettingsRoboTests
Change-Id: Idb26ded937dd31f08c96323d5064947a6af86156
Merged-In: I22b85799ad547aca1ce4e63af3f39bc7f29618c6
2020-01-15 21:52:43 +08:00
Bonian Chen
368c885b98
[Settings] Remove unused ImsStatusPreferenceController
...
Legacy code clean up.
Bug: 147534443
Test: build pass
Change-Id: I4dd9c1c623296385eab6e14c10956cea27a04f75
2020-01-15 20:50:24 +08:00