Commit Graph

48330 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
f19a9840d7 Merge "Remove emptry preference category for Talkback" 2018-11-01 20:51:30 +00: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
e4b4923dd0 Merge "Fix slice card layout so show more button works correctly" 2018-11-01 19:14:40 +00:00
Fan Zhang
303fd8cc1a Merge "Use safe icon when building unavailable slices." 2018-11-01 19:13:37 +00:00
Fan Zhang
08f677d9e0 Merge "Change Google Settings position" 2018-11-01 18:19:08 +00:00
jackqdyulei
ece1219db6 Remove emptry preference category for Talkback
In this way talkback can get correct list size.

Bug: 117198438
Test: Manual
Change-Id: Ie0cd78fb20fe416ee517d6c35458a4805ce9c17f
2018-11-01 10:08:35 -07:00
TreeHugger Robot
c2a07ac938 Merge "Click "Users & Profile" in Settings Search displays a blueline" 2018-11-01 16:58:10 +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
Raff Tsai
2e6f061b76 Change Google Settings position
- PreferenceGroup defines dynamic insert order starts from 0. It is
bigger than System Settings definition -10, therefore Google Settings
will be placed below System Settings.

Fixes: 118735593
Test: Visual
Change-Id: Id2d187810a8539ea50e14ef802db6eae58b846e4
2018-11-01 16:56:57 +08:00
James Lemieux
6d2fbea6e5 Merge "Make Settings robotest work with tot Robolectric" 2018-11-01 05:48:14 +00:00
Stanley Wang
8cf919e933 Merge "Fix Developer options page memory leak" 2018-11-01 02:09:33 +00:00
Kevin Chyn
66d09a42d9 Add android.settings.BIOMETRIC_ENROLL action intent
Fixes: 112925362

Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: I8dc37520b290483dab46cee2f6ca8612f4cf870e
2018-10-31 18:07:07 -07:00
Fan Zhang
cdf284b732 Make Settings robotest work with tot Robolectric
Bug: 116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2018-10-31 17:59:17 -07:00
Lei Yu
dd3feeb155 Merge "Rename a bunch of mobile network files" 2018-10-31 20:04:03 +00:00
TreeHugger Robot
d7fb88333f Merge "Import translations. DO NOT MERGE" 2018-10-31 19:40:26 +00:00
TreeHugger Robot
db403ad785 Merge "Update network select page" 2018-10-31 18:56:43 +00:00
TreeHugger Robot
87e4b48cb7 Merge "Add a feature flag for new version of Network and internet settings page" 2018-10-31 08:06:31 +00:00
Lei Yu
792e5ecf91 Merge "Add ACL state listener for bt devices" 2018-10-31 06:12:46 +00:00
Antony Sargent
2cbd720d21 Add a feature flag for new version of Network and internet settings page
In addition to adding the flag, this also adds a new xml layout that is
the same as the existing network and internet page, but will begin to be
changed in subsequent CLs. There is also a change in code to use this
new layout when the flag is turned on.

One other change is to make the list of displayed feature flags in
developer options be in sorted order instead of whatever semirandom
order they come out of the map's key set.

Bug: 116349402
Test: Manual (settings_network_and_internet_v2 flag should should up in
Settings -> System -> Developer options -> Feature flags, and those
flags should be in sorted order)

Change-Id: I5520d286efb6bec50ba4ca99f64aeca94f01d533
2018-10-31 05:29:34 +00:00
Bill Yi
f84d9124c5 Import translations. DO NOT MERGE
Change-Id: I05c3010b112b0f65bf246b73cf482d9722f75648
Auto-generated-cl: translation import
2018-10-30 21:18:57 -07:00
Fan Zhang
2fa9b7b652 Fix slice card layout so show more button works correctly
Change padding top/bottom to margin, so the sliceview can use the full
288dp height (4 rows + see more button).

Side effect is that ripple doesn't fill the entire cardview. But it
never did anyway.

Change-Id: Ie57187fbe2b8caa2cf9d0dc31d7678eee07085f4
Fixes: 118398695
Test: visual
2018-10-31 11:09:28 +08:00
Raff Tsai
0be77ac054 Click "Users & Profile" in Settings Search displays a blueline
- It is a preference category, remove it from search result.

Fixes: 118654997
Test: Clear Settings Sugggestion data and search again.
Change-Id: I5a41e03c3fa703913233353a90b65ae18a7ab06b
2018-10-31 10:54:04 +08:00
jackqdyulei
2aae67a061 Rename a bunch of mobile network files
1. Make them have "MobileNetwork" prefix
2. Also update WifiCallingPreference to remove its category
if it is invisible

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I25871d579d6495e902e5583030889942ed2506a8
2018-10-30 16:28:56 -07:00
Lei Yu
76da1123e4 Merge "Update the mobile activity" 2018-10-30 22:56:01 +00:00
jackqdyulei
0edde89f83 Add ACL state listener for bt devices
Bug: 79947085
Test: RunSettingsRoboTests
Change-Id: Ic8bee34fa940f95265ed838f7c7f038ba3cf8143
2018-10-30 15:54:41 -07:00
Fan Zhang
6f5b4d3126 Merge "Stop showing account based cards in homepage." 2018-10-30 22:31:04 +00:00
jackqdyulei
4f0c28da9e Update network select page
1. use getPrefContext() to make sure it has correct style
2. Move operation back to bg thread so it won't block UI

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7737ea8b21d44790617b9c4f13a8c4c41037fca4
2018-10-30 14:59:35 -07:00
Fan Zhang
f535055e2e Use safe icon when building unavailable slices.
And move ic_a11y_generic from mipmap to drawable. IconCompat doesn't
support mipmap.

Bug: 118691898
Test: robotests
Change-Id: I6799f3d31d2c5654319e5a97bf8ca14992e785a7
2018-10-30 14:48:47 -07:00
Fan Zhang
d3ccae1bad Merge "Fix Display settings summary when there is no wallpaper." 2018-10-30 21:16:26 +00:00
Fan Zhang
13b60bb15a Stop showing account based cards in homepage.
Removed data usage/device info/emergency/storage cards

Bug: 118691898
Test: robotests
Change-Id: I9f1ef3f022be9ca37e3359a6820a716d4ebade0f
2018-10-30 13:37:02 -07:00
Fan Zhang
0023558ec3 Fix Display settings summary when there is no wallpaper.
Change-Id: I715cef9dc42de1231491b5a7184f0f151d94af11
Fixes: 69905032
Test: robotests
2018-10-30 10:10:30 -07:00
Stanley Wang
f838aa1059 Fix Developer options page memory leak
Change-Id: I12d53c41adee56850cd294ae89e7a56328639558
Fixes: 117583710
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.development
2018-10-30 17:49:59 +08:00
Raff Tsai
80306d1aef Merge "Fix Settings crash on changing device orientation" 2018-10-30 09:12:17 +00:00
Raff Tsai
1d88f4c61b Fix Settings crash on changing device orientation
- AppDataUsage assign preferences to Applist in loaderCallback.
When device rotate we will assign preference to Applist second
time which throw IllegalStateException Exception. We will use
restartLoader which create new loader rather than use existed
loader.

Change-Id: I540d645e930a29f989c4fe374e2103ca201da198
Fixes: 118195540
Test: manual
2018-10-30 09:57:53 +08:00
TreeHugger Robot
0c95a2980c Merge "Refine the logic to show/hide cdma preference" 2018-10-29 22:55:57 +00:00
TreeHugger Robot
f93b925588 Merge "Use ImeAwareEditText in FingerprintSettings" 2018-10-29 22:48:29 +00:00
Rakesh Iyer
7ad62ef340 Merge "Misc fixes to TTS settings." 2018-10-29 21:26:26 +00:00
jackqdyulei
008c7781e8 Refine the logic to show/hide cdma preference
1. Add special check for "system select"
2. For cdma, need to check whether to hide carrier settings

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I0a20816912500725894208a60bba7a5c74912561
2018-10-29 14:16:14 -07:00
Lei Yu
50b7faa031 [automerger skipped] Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"
am: 73c361b544  -s ours

Change-Id: I93e8e42b3892dae3d2ab8ed7683503079e93df1a
2018-10-29 13:55:51 -07:00
Lei Yu
73c361b544 Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"
This reverts commit e81224d80c.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ib45b96216017d01b6301a558a0cd27bf1071779c
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-29 20:35:24 +00:00
TreeHugger Robot
5422d7ea0a Merge "Add Connected Device slice to Contextual Settings Homepage" 2018-10-29 20:27:24 +00:00
Yohei Yukawa
af4426bb65 Use ImeAwareEditText in FingerprintSettings
Like we did the same thing in the Settings app [1][2][3],
FingerprintSetting is another instance that should use
ImeAwareEditText to make sure InputMethodManager#showSoftInput() is
called after the EditText gains IME focus.

This approach should be more robust and easier to maintain than trying
to control the software keyboard visibility with
SOFT_INPUT_STATE_ALWAYS_VISIBLE, which is more complicated that people
think.

This CL also removes RenameDialog#mTextHadFocus since
RenameDialog#mDialogTextField is always focused when the dialog is
shown [4].

This CL also removes the following fields since they can just be a
local final variables that will be captured into callback.

 * RenameDialog#mFingerName
 * RenameDialog#mTextSelectionStart
 * RenameDialog#mTextSelectionEnd

 [1]: I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235
      f6af093e2d
 [2]: I892d639f3cc5d43db553b682d5278b8ce2fe72da
      4803267106
 [3]: Ib75ba0f361b8b46c3b717cc1ffb864726958ed82
      b0bcbed372
 [4]: I5bb1b7227c1323595bf7f483e11e87e2c3550093
      7a1d52eb06

Fix: 118473687
Test: Manually verified as follows.
      1. Build and flash aosp_taimen-userdebug to Taimen
      2. Set up a fingerprint unlock.
      3. Rotate the device to landscape mode.
      4. Open Settings -> Security & location -> Fingerprint
      5. Re-enter password if necessary
      6. Tap "Finger 1"
      7. Make sure that AOSP Keyboard shows up
Change-Id: I2a137aa8f6a1ee2b67923bcf40e82320a56c7b59
2018-10-29 13:09:12 -07:00
jackqdyulei
400e13cc11 Update the mobile activity
1. Add listener to ACTION_RADIO_TECHNOLOGY_CHANGED
2. Update fragment switch by using replace
3. Remove todo for sort because list is already sorted by sim slot
4. Make actiivty accept SUB_ID from intent
5. Add icon for multi-sim support

Bug: 114749736
Test: RunSettingsRoboTests && Screenshot

Change-Id: I11c472b1479ec9243266cb2a7ef4292370ac6894
2018-10-29 13:05:50 -07:00