Commit Graph

24101 Commits

Author SHA1 Message Date
TreeHugger Robot
70609fad7d Merge "Fix Settings crash after disabling Settings Suggestion" 2018-11-07 07:46:35 +00:00
Clown SHEN
98ce7a1a7d Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c am: 74fe4a9177
am: 4f2055500a

Change-Id: I326052d639276b89859770fbe110a73f80c4a9fc
2018-11-06 23:39:50 -08:00
Clown SHEN
4f2055500a Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c
am: 74fe4a9177

Change-Id: Ib61988a9f84ed10d4ac0d6b1a0d8b7d4f8897224
2018-11-06 23:35:41 -08:00
Raff Tsai
2928cd4c72 Fix Settings crash after disabling Settings Suggestion
- Settings Suggestion App is responsible for searching, we can not
prevent user disable it. Hide search feature if user disable it.

Fixes: 118805907
Fixes: 117921464
Test: manual
Change-Id: I61c47c52265a6efd79ef2fa60272bf6513e678b1
2018-11-07 14:11:23 +08:00
TreeHugger Robot
7d704c8798 Merge "Adjust lookup table mechanism to support new UI of conditional card" 2018-11-07 03:00:49 +00:00
TreeHugger Robot
ebe6774a2c Merge "Use inline radio buttons for Prevent Ringing" 2018-11-07 01:52:47 +00:00
Lei Yu
32cbfe9cf2 Merge "Increase battery app list maximum size to 20" 2018-11-07 00:54:22 +00:00
Mill Chen
d20641059f Adjust lookup table mechanism to support new UI of conditional card
Use layout resource id as the return value of getItemViewType
in the ContextualCardsAdapter to make sure the RecyclerView could
work normally, and adjust the lookup table mechanism to meet the
current design as well.

Bug: 113451905, 112578070
Test: visual, robotest
Change-Id: I8fa299e44025a0b71b6990d020e7f0683c153337
2018-11-06 16:09:17 -08:00
Antony Sargent
95f34b43f4 Check accounts in all profiles on account detail dashboard
In cl/5074783 I fixed a problem with account deletion where the account
didn't appear to be deleted even when it was. Part of that fix broke the
ability to make changes to work profile accounts - this CL fixes that by
making sure not to early exit the account detail dashboard unless we've
checked the accounts owned by all profiles for the user.

Bug: 117965642
Test: make -j40 RunSettingsRoboTests
Change-Id: Id034418beb4aec8bd4d10191b4924509d27e55d4
2018-11-06 21:21:04 +00:00
Fan Zhang
92792ee806 Merge "Added card_dismissed field into cards table" 2018-11-06 18:44:56 +00:00
Beverly
c1fd6dc5a3 Use inline radio buttons for Prevent Ringing
Test: atest PreventRingingGesturePreferenceControllerTest
Fixes: 79867902

Change-Id: I3c9f949e038bba98e5be972adc01f35f5513432a
2018-11-06 10:12:08 -05:00
Sunny Shao
647d3e3047 Added card_dismissed field into cards table
Added card_dismissed field to keep user dismissal behavior and filter it when cards loaded

Bug: 113783548
Test: manual test
Change-Id: I27549eca95c2e49fcc92fa59a5c02da73814a522
2018-11-06 20:59:46 +08:00
Emily Chuang
f519e3ffe5 Make ContextualCardLoader do entire loading upon fragment's onStart()
For dismissal mechanism, we will have to get information about those
dismissed cards that are stored in Card DB with flag "dismiss" to filter
them out. Currently we only do the entire loading in fragment's
onCreate(), so only when the fragment is recreated users can get the new
data. Now we are changing it to onStart() and make the loader restart so
we are able to show the latest cards.

Change-Id: I4c0be297232f026b46feb8084084816e1acc8f11
Fixes: 119090460
Bug: 113783548
Test: visual
2018-11-06 19:56:42 +08:00
Stanley Wang
5d2a3d23e7 Merge "Architecture review of Copyable Slice" 2018-11-06 05:00:05 +00:00
Stanley Wang
51c9404182 Architecture review of Copyable Slice
Design doc: https://drive.google.com/open?id=1NJPd_282H4195HUGJH5cGJO_Jrcz1Vl6AAw_VQOtGq0

Fixes: 	118398321
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.slice

Change-Id: Ic6762e58698a994d16a5de1778b4035ae430a256
2018-11-06 11:01:17 +08:00
TreeHugger Robot
1d436aade2 Merge changes from topic "refactor-security-location"
* changes:
  Rename title of Security page
  Move LocationSettings to top level page.
2018-11-06 02:01:17 +00:00
TreeHugger Robot
998eaa0585 Merge "Enforce all the SliceBackgroundWorkers being singletons at syntax level" 2018-11-06 00:55:54 +00:00
Jason Chiu
a68f81540e Enforce all the SliceBackgroundWorkers being singletons at syntax level
- Create workers via reflection in SliceBackgroundWorker
- Store the workers in a static container and release then at shutdown()

Fixes: 118228009
Test: robolectric
Change-Id: I564277d3a12b2d7d3b50cef091bdfedb3397c145
2018-11-05 21:41:30 +00:00
TreeHugger Robot
9fb79cbe16 Merge "Remove the unnecessary preferenceCategory" 2018-11-05 19:55:55 +00:00
Beverly Tai
7ebb059ea5 Merge "Set modified=true when user changes zen rule name" 2018-11-05 18:58:39 +00:00
Vadim Tryshev
b9cc394a0e Merge "Using intent action for DWB properties exposed as an API" 2018-11-05 18:42:29 +00:00
Lei Yu
152081e7b0 Merge "Add null check for carrierConfig" 2018-11-05 18:29:56 +00:00
Rakesh Iyer
a2837815b5 Merge "Disable controls during playback." 2018-11-05 17:44:29 +00:00
Sunny Shao
201f1f6146 Merge "Added the icon displayed on no account in search bar" 2018-11-05 05:31:03 +00:00
tmfang
54a5d37190 Move LocationSettings to top level page.
- Create some location icons for different scenario.
- Remove Location in Security page.
- Move Location Setting to top level page.

Test: robotest, visual
Bug: 116628158
Change-Id: I3f57ef49a396877bfbeaefea7dc4f4051e0ccc65
2018-11-05 11:24:41 +08:00
Sunny Shao
6dc1cc2a77 Added the icon displayed on no account in search bar
Mofidied the search_bar layout and added this icon in the right side of the search_bar.
Added the hasAccount api in AvatarViewMixin and display this icon when there is no any account in device.
Added the test case of the AvatarViewMixin.

Bug: 117509285
Test: robotest
Change-Id: I6ceaa457af4fb20acd0211ca840df5b530c47e0f
2018-11-05 10:52:11 +08:00
TreeHugger Robot
c9b56254a6 Merge "Update show4GForLTE config" 2018-11-03 07:10:34 +00:00
jackqdyulei
9588d2af14 Update show4GForLTE config
Get it from CarrierConfigManager instead of config in systemui package.
Also remove unused CdmaOptions

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Iac47a60e51f68047b8f800dbdcf0efbcd432a015
2018-11-02 14:28:36 -07:00
jackqdyulei
ef79de6ad9 Remove the unnecessary preferenceCategory
In talkback, it counts the untitled preferenceCategory as an visiable
item. This CL remove unnecessary cateogry and add divider line manually.

Bug: 118796245
Test: RunSettingsRoboTests

Change-Id: I77151fdce671cf91322b3c1badc06a3b7861dcc0
2018-11-02 13:24:14 -07:00
Rakesh Iyer
f4627bb608 Disable controls during playback.
The controls were enabled during playback earlier,
however changing them did nothing to the current
playout. Disable them during playout and re-enable
them once playout is done.

Bug: 77976922
Test: Repro case in linked bug.
Change-Id: I0fbe1c97e794fccc49172ee7542018aeef956c8f
2018-11-02 12:34:52 -07:00
jackqdyulei
16c5d77df8 Add null check for carrierConfig
Since it may return null when Crash happens in CarrierConfigManager

Bug: 118402844
Test: RunSettingsRoboTests
Change-Id: I9db0f1a873b3e24936b021989f6716369569b17b
2018-11-02 11:25:37 -07:00
Eugene Susla
cabbb1a522 Merge "Add developer option for sms access kill switch" 2018-11-02 18:18:51 +00:00
Fan Zhang
2d2b594935 Merge "Remove db restriction for category column." 2018-11-02 18:00:11 +00:00
Beverly
8228c6ee02 Set modified=true when user changes zen rule name
Test: make RunSettingsRoboTests -j40
Bug: 118789422
Change-Id: I3df3ce4c86a100c2c1287e3650d7fb331d5fa71c
2018-11-02 13:43:17 -04:00
Fan Zhang
a923a4113a Merge "Clean up ConditionalCards" 2018-11-02 16:43:50 +00:00
Raff Tsai
71945ff5be Merge "Add Category for contextual cards" 2018-11-02 02:56:21 +00:00
Cosmo Hsieh
c842290974 Merge "Implement NetworkRequestDialog architecture" 2018-11-02 01:39:47 +00:00
Kenny Root
f316ab8de6 Merge "Track change to add ADB service" 2018-11-02 00:43:05 +00:00
Kevin Chyn
0e11b18cf0 Merge changes from topic "biometric-cc"
* changes:
  3/n: Make CDCA transparent and add BiometricPrompt
  2/n: Add comments to launchConfirmationActivity parameters
  1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
2018-11-02 00:37:24 +00:00
TreeHugger Robot
887564b114 Merge "Dnd settings pages redesign (round 1)" 2018-11-01 23:47:36 +00:00
Fan Zhang
7775f67053 Remove db restriction for category column.
SettingsIntelligence should be able to extend support to more categories
without changing Settings.

Bug: 118708391
Test: rebuild
Change-Id: I420394f718bb3712e94040fb3e3c4f66cca629af
2018-11-01 16:31:13 -07:00
Kevin Chyn
b3ee23154d 3/n: Make CDCA transparent and add BiometricPrompt
ConfirmDeviceCredentials now uses BiometricPrompt instead of
FingerprintManager

Bug: 111461540

Test: FRP does not display BiometricPrompt (as expected)
      adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL
Test: Using KeyguardManager API to launch, all corner cases seem OK
Test: Tested with work profile + one lock enabled/disabled, seems OK
Test: Enroll normal FP but not work FP, BiometricPromptDemo for both works
      OK
Test: Test CC on work version of BPD, then BP on normal version of BPD,
      both accept correct FP's (no regression from P)

Change-Id: Iacdaf76ab76971850212dc79513bfa3f4b89eb9a
2018-11-01 15:14:04 -07:00
TreeHugger Robot
0af2ade371 Merge "Remove "See more" from wifi/bluetooth slices" 2018-11-01 21:59:45 +00:00
Fan Zhang
b739e7cd7f Clean up ConditionalCards
Use ConditionalContextualCard directly.

Change-Id: If2e51cdd2cbed27b0094bbb9be06ee9a67f328ec
Fixes: 114307767
Test: robotests
2018-11-01 14:25:53 -07:00
Kevin Chyn
80ecfd95bc 2/n: Add comments to launchConfirmationActivity parameters
Bug: 111461540

Test: builds
Change-Id: I9b2cd9ee472bc67604664671ba022e8589269ee1
2018-11-01 14:11:57 -07:00
Kevin Chyn
e5a016e076 1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
CDC is going to use BiometricPrompt instead. This change
removes FingerprintManager from CDC. BiometricPrompt
will show before pin/pattern/pass is shown.

Bug: 111461540

Test: modified BiometricPromptDemo to use
      KeyguardManager#createConfirmDeviceCredentialIntent,
Test: Fingerprint is gone from CDC, rotation works
Test: atest SettingsRoboTests

Change-Id: I9ce2aad71961af8a0d5ee636600e2fbdb6154e47
2018-11-01 14:11:57 -07:00
Emily Chuang
4b08270d8c Remove "See more" from wifi/bluetooth slices
- Also set the height of SliceView back to wrap_content as the space our
content needs can be satisfied with MODE_LARGE.

Change-Id: Ibaa514ac9c022c2723d99e5104f8d5ec63f14661
Fixes: 118763869
Test: robotests, visual
2018-11-01 12:32:51 -07:00
Kevin Chyn
c6d0e9d2c0 Merge "Add android.settings.BIOMETRIC_ENROLL action intent" 2018-11-01 19:29:23 +00:00
Fan Zhang
303fd8cc1a Merge "Use safe icon when building unavailable slices." 2018-11-01 19:13:37 +00:00
Beverly
69d11b2874 Dnd settings pages redesign (round 1)
Test: make RunSettingsRoboTests -j40
Bug: 111475013
Change-Id: Idb6bbfdfe377b61a8fe1f7e81171bbefe23a4ebf
2018-11-01 09:24:46 -04:00