Commit Graph

51319 Commits

Author SHA1 Message Date
Colin Cross
2e7a226e65 Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp 2019-04-16 03:35:51 +00:00
Jordan Liu
5ccb19e418 [automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev
am: 80584fe1f7 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 e431f6337f is in history

Change-Id: I5101430419c3f026c00e52d09ae2b426febbd12d
2019-04-15 15:35:37 -07:00
Jordan Liu
80584fe1f7 Merge "Make RadioInfo settings menu work for mSIM" into qt-dev 2019-04-15 21:55:43 +00:00
Jordan Liu
f47e4cc536 [automerger skipped] Merge "Do not reuse phonestatelistener" am: c99fddfe75
am: 1636344325 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 85f1d2a704 is in history

Change-Id: I3879f0514ab892b4c2826eb880374f634ba80822
2019-04-15 12:42:46 -07:00
Jordan Liu
1636344325 Merge "Do not reuse phonestatelistener"
am: c99fddfe75

Change-Id: I52e311da7ae9a9477b74fc25f6bb122935e14582
2019-04-15 12:37:48 -07:00
Jordan Liu
c99fddfe75 Merge "Do not reuse phonestatelistener" 2019-04-15 19:27:06 +00:00
Lei Yu
c562fdcebf Merge "Hide app usage time in high usage dialog" into qt-dev
am: 9515a685e3

Change-Id: Ibe5266fd010ab54350d679f0b1710b08ff05aa4a
2019-04-15 11:12:22 -07:00
Lei Yu
9515a685e3 Merge "Hide app usage time in high usage dialog" into qt-dev 2019-04-15 17:54:39 +00:00
Cosmo Hsieh
bd8c87097d Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev
am: 96b534951c

Change-Id: I5fd338e5bcabe349740e586406aac7ceba1f2102
2019-04-13 22:56:56 -07:00
Cosmo Hsieh
96b534951c Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev 2019-04-14 05:51:02 +00:00
Antony Sargent
265971cc1e Merge "Update intent in SimNotification" into qt-dev
am: ead402c329

Change-Id: I56ca38510190315b6cf74cd81d3b4f0321adb062
2019-04-13 22:22:53 -07:00
TreeHugger Robot
ead402c329 Merge "Update intent in SimNotification" into qt-dev 2019-04-14 05:11:58 +00:00
Kevin Chyn
9433c38eb6 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev
am: 79f49b4626

Change-Id: I605486afb4126619bcdfa1261ad8a3bb33647235
2019-04-13 21:11:32 -07:00
Pasty Chang
247c77e6ec Merge "Set suw description textview to fixed id" into qt-dev
am: ee35c1bddf

Change-Id: I306cedd59e191de716616e1815c81230046b314b
2019-04-13 21:06:37 -07:00
Kevin Chyn
79f49b4626 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev 2019-04-14 04:03:54 +00:00
Pasty Chang
ee35c1bddf Merge "Set suw description textview to fixed id" into qt-dev 2019-04-14 03:53:16 +00:00
Bill Yi
3460820b57 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: bea1ed8666 -s ours
am: ad53ebb2da -s ours
am skip reason: subject contains skip directive

Change-Id: Iadd8fa72e16ff5385af2d419badc0825ee3d3d9e
2019-04-13 05:06:34 -07:00
Bill Yi
ad53ebb2da [automerger skipped] Merge "Import translations. DO NOT MERGE"
am: bea1ed8666 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec39c3c20fdb63b908c40ca9273a17e1baef8612
2019-04-13 04:57:24 -07:00
Treehugger Robot
bea1ed8666 Merge "Import translations. DO NOT MERGE" 2019-04-13 11:45:22 +00:00
Bill Yi
691efb9036 Import translations. DO NOT MERGE
Change-Id: I3445f31f0d5fb57f93a26c58cc8686a453bb8c46
Auto-generated-cl: translation import
2019-04-13 03:41:31 -07:00
Kevin Chyn
5ab064f343 Launch correct enrollment activity from ChooseLock
Test: no noticable difference when setting up fingeprint work profile

Fixes: 130397083
Change-Id: I34be5262cc52052ce25a188f19bbcc13f938ac92
2019-04-13 08:17:38 +00:00
Fan Zhang
a3c86b45ee Merge "Update search bar background drawable for dark mode" into qt-dev
am: c4083cecd7

Change-Id: Ibbcbbea8620d89e94669846faeb34856952845e8
2019-04-12 18:51:40 -07:00
Fan Zhang
15cadab3b0 Merge changes from topic "Hide notification channel slice" into qt-dev
am: 4ce0bf7336

Change-Id: I2f409463837ddb5bb5b5ce58ef5851999a176f0b
2019-04-12 17:43:47 -07:00
Jordan Liu
9bdef81f0d [automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev
am: ac4e5dfa53 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 728e186441 is in history

Change-Id: I2e205b64a8dbb3a2d5388510906f7f7073c7b19a
2019-04-12 17:20:20 -07:00
Fan Zhang
c4083cecd7 Merge "Update search bar background drawable for dark mode" into qt-dev 2019-04-13 00:01:12 +00:00
Fan Zhang
4ce0bf7336 Merge changes from topic "Hide notification channel slice" into qt-dev
* changes:
  Log interacted package from ContextualNotificationChannelSlice
  Hide notification channel slice that is interacted
2019-04-12 23:38:27 +00:00
Jordan Liu
ac4e5dfa53 Merge "Make RadioInfo settings menu work for mSIM" into qt-dev 2019-04-12 23:27:45 +00:00
Fan Zhang
5f27727f42 Merge "Misc bug fixes around search bar in app list UI." into qt-dev
am: 24c02bb50f

Change-Id: Ia2dc1569c15c824a7aa9b964001cf1ed151d841f
2019-04-12 16:25:19 -07:00
lindatseng
1d7db47f2f Merge "Update panel logging to include all hide page cases" into qt-dev
am: 878236f318

Change-Id: I02a6d2f7d3508c4544856af469a96923da203d47
2019-04-12 16:23:11 -07:00
Antony Sargent
8eb1660da7 Update intent in SimNotification
When you add/remove a SIM, telephony notifies settings and we pop up a
notification. Tapping on that notification was still leading to our old
SIM cards page, but should instead lead to the Network & internet page
where we've added a bunch of new UI for doing the same sorts of
operations.

Bug: 128859223
Test: manual (remove a SIM or add a SIM in DSDS mode; a notification
telling you that sim cards have changed should pop up, clicking that
should lead to Network & internet page in settings)

Change-Id: I9c1e656dcc3e8fc9147bb99861d8fdc15ed09be9
2019-04-12 16:10:52 -07:00
Lei Yu
2f90dd784f Hide app usage time in high usage dialog
Also update strings a little bit

Bug: 112285389
Test: Manual
Change-Id: I5c4f3e2de635eb0b880d2d3d5a1550e1af41d931
2019-04-12 22:39:44 +00:00
TreeHugger Robot
24c02bb50f Merge "Misc bug fixes around search bar in app list UI." into qt-dev 2019-04-12 22:33:33 +00:00
TreeHugger Robot
878236f318 Merge "Update panel logging to include all hide page cases" into qt-dev 2019-04-12 22:33:24 +00:00
Jordan Liu
85f1d2a704 Make RadioInfo settings menu work for mSIM
Just add a spinner to the top of the screen which lets you select the
phoneIndex. Upating this value updates the mTelephonyManager
mImsManager, and mPhoneStateListener to use the selected phoneIndex and
the subscription associated with it.

Also adds fields for current subId and default data sim subId.

Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Test: manual test (on single sim)
Fixes: 128033739
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
2019-04-12 15:00:05 -07:00
cosmohsieh
1a5bd24d58 Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev
am: ab3fed9b69

Change-Id: Ifb497131b4bab035840e23b14987eb40f7088810
2019-04-12 14:55:23 -07:00
Jordan Liu
24ed72f830 Make RadioInfo settings menu work for mSIM
Just add a spinner to the top of the screen which lets you select the
phoneIndex. Upating this value updates the mTelephonyManager
mImsManager, and mPhoneStateListener to use the selected phoneIndex and
the subscription associated with it.

Also adds fields for current subId and default data sim subId.

Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Test: manual test (on single sim)
Fixes: 128033739
Change-Id: Id075e3bffe20523d8ceeb8f2e4320f995abdab55
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
2019-04-12 14:54:41 -07:00
TreeHugger Robot
ab3fed9b69 Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev 2019-04-12 21:27:37 +00:00
Fan Zhang
270fd6c872 Misc bug fixes around search bar in app list UI.
- Turn off DEBUG log flag, it's spammy and is a potential PII risk.
- Save search bar expand state so it stays open during screen rotation.
- Introduce a intent extra so callers can deep link into this UI with
  search bar pre-expanded.

Fixes: 130422388
Test: robotest
Change-Id: Ib81080733707306de516c49340571c543e70874e
2019-04-12 13:50:54 -07:00
Maurice Lam
e1e52f7940 Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev
am: 76ffb2df02

Change-Id: I5a6c0aa2689ac171f832dce3464603640b44bf80
2019-04-12 12:48:32 -07:00
Lei Yu
bb94324293 Merge "Disable icon for NetworkOperatorPreference" into qt-dev
am: a55af7ea34

Change-Id: Iff4fb149a8b9a18d79524c76056fc3ec1eb37a8d
2019-04-12 12:40:38 -07:00
lindatseng
79957c3217 Update panel logging to include all hide page cases
The old logging only include see_more, done, and clicked_out when hiding
the panel page.  We were missing many cases that user might use back
button, app switch button to close the page.

Update the hide page keys to change the clicked_out to others to
include all the other cases which hide the page.

Test: Manual verification
Test: atest PanelFragmentTest SettingsPanelActivityTest
Fixes: 130169553
Change-Id: Icede9a8dcb84565cba183963c9fb554507631c98
2019-04-12 11:33:41 -07:00
Maurice Lam
76ffb2df02 Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev 2019-04-12 17:59:42 +00:00
Lei Yu
a55af7ea34 Merge "Disable icon for NetworkOperatorPreference" into qt-dev 2019-04-12 17:44:59 +00:00
Jordan Liu
e431f6337f Do not reuse phonestatelistener
Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Fixes: 129989656
Test: manual
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I7630e74a9361093d8cbe72fa72c14aaaab9fcc17
2019-04-12 17:26:10 +00:00
cosmohsieh
b0aee6abd0 Fix null App name in Wi-Fi scanning prompt dialog
App name of the dialog msg is null because getCallingPackage() is null
when calling activity does not use startActvitiyForResult().

Bug: 112248584
Test: manual
Change-Id: If5ba9eb62f895c66ac1839b4be5c372ecba6699c
2019-04-12 17:02:22 +00:00
cosmohsieh
6938ad1630 [PasspointV2] Clear feature flag settings_wifi_details_saved_screen
Clear feature flag settings_wifi_details_saved_screen

Bug: b/128369527
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ib8fc9c9eb52bee12d6501a2041c32aa60c80e70e
2019-04-13 00:58:23 +08:00
Yanting Yang
21f9a0f6c9 Update search bar background drawable for dark mode
Bug: 129996634
Test: visual

Change-Id: I1657b1b570bf79ad776ae80b2f2878e4f4d72481
2019-04-12 20:42:08 +08:00
pastychang
fa68ec4f56 Set suw description textview to fixed id
Heavy theme supports to costomize description text style. Modify it to fixed id
that can be customized by partner resource.

Heavy theme screenshot: https://screenshot.googleplex.com/TL4M7wmTaPg
Set fixed id screenshot: https://screenshot.googleplex.com/CA6QHoNTQBZ

Test: atest
Bug: 121988926
Change-Id: I8882acd49e7d57f24afa9dd6f3e9abfd06556053
2019-04-12 09:20:12 +00:00
Yanting Yang
b29e53a450 Log interacted package from ContextualNotificationChannelSlice
Fixes:129726858
Test: visual, robotests
Change-Id: Ife4043fe0bcb52445e8e2efec20781ce43c54fef
2019-04-12 15:28:29 +08:00
Yanting Yang
78e097f239 Hide notification channel slice that is interacted
- Ignore interacted package in ContextualNotificationChannelSlice.
- Regularly clear package record with background worker.

Bug:129726858
Test: visual, robotests

Change-Id: I94661a53bcbbe4a15479224c33cfb2eff345aa67
2019-04-12 15:27:49 +08:00