Commit Graph

27731 Commits

Author SHA1 Message Date
Yi Jiang
9df180a008 use different description strings for screen attention settings and contextual card
1. Revert the screen attention description string to the old approved
string.
2. Create a new summary string for 'Screen Attention' contextual slice.
3. Fix some character issues.
Bug: 134457354
Bug: 134585794
Test: make RunSettingsRoboTests -j 32
Change-Id: I401fc6707203790e51aed8738b4658c6a30f512e
2019-06-05 13:22:19 -07:00
Xiangyu/Malcolm Chen
d9d9a79d31 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2 am: 226715e54e
am: b55caa7afc

Change-Id: I7d5c7d1715a558d281851e54b44ee915d6f41bd5
2019-06-05 11:49:35 -07:00
Xiangyu/Malcolm Chen
b55caa7afc Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
am: 226715e54e

Change-Id: I64ef08b8d8b5215a20017e70f36678d4f2d8c510
2019-06-05 11:35:09 -07:00
Julia Reynolds
569732474e Read the subtext of notif importance field on selection
When using a11y services

Test: manual with Talkback
Bug: 133649570
Change-Id: Ic68a948ab5d55e68994e6b14456d25d438637886
2019-06-05 18:31:19 +00:00
Xiangyu/Malcolm Chen
226715e54e Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: 13cbb2eea2

Change-Id: I8ba31e7278d911bf6cef19e46d06ed964ae9e36f
2019-06-05 11:21:33 -07:00
Xiangyu/Malcolm Chen
f6ae3fa64a Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: 13cbb2eea2

Change-Id: I9b9799889ce5e3474ccfcdd4b33dfafcd0092e0e
2019-06-05 11:21:32 -07:00
Xiangyu/Malcolm Chen
13cbb2eea2 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev 2019-06-05 18:03:17 +00:00
Anthony Han
19747eba0e Hide color mode in search during A11y
Bug: 133527869
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: Iac1146e6bfb391553b05f44fded2db17414b4605
2019-06-05 10:44:05 -07:00
Anthony Han
000d8336de Hide color mode when unavailable
When no color modes are available, make the setting unsearchable.

Bug: 131035509
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: I2dca681b981b646858c3ae1af4fafbee74fd06ee
2019-06-05 10:36:18 -07:00
Alexey Kuzmin
506eddcf6e Move vibration preview invokation to the correct place am: f8eb8c3c90 am: df51217157
am: e8200af63a

Change-Id: Ie3d6485881cf48dfd75383985c5de4afad9b69f1
2019-06-04 19:33:32 -07:00
Kevin Chyn
cae6beda95 Merge changes from topic "face-settings-challenge" into qt-r1-dev am: b979a38c8d
am: 2ec0c38e1f

Change-Id: Ia41cdafdb189e71273f4a251b2953cf49b1b2fac
2019-06-04 19:28:14 -07:00
Alexey Kuzmin
e8200af63a Move vibration preview invokation to the correct place am: f8eb8c3c90
am: df51217157

Change-Id: I35c08d49566a58b6add49f807b48a4c6a2afb918
2019-06-04 18:51:10 -07:00
Kevin Chyn
2ec0c38e1f Merge changes from topic "face-settings-challenge" into qt-r1-dev
am: b979a38c8d

Change-Id: I3fd5ba0467eec804d75a5ceb08c56700d7e07b64
2019-06-04 18:48:33 -07:00
Michael Groover
2123e3543c Remove developer option to disable device ID access restrictions
Bug: 123937881
Test: Manually verified developer option is no longer available.
Change-Id: I00e8db23d88a5c84e273dfa4b8f797fa2a995de0
2019-06-04 18:30:21 -07:00
Alexey Kuzmin
ef530610fa Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
2019-06-04 18:16:10 -07:00
Alexey Kuzmin
df51217157 Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: I252301516d7be6b5026e4fba5b5e9144889f6b1f
2019-06-04 18:00:48 -07:00
Malcolm Chen
57badc2a82 Triggering notifications when dual CDMA SIM combinations are detected
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
2019-06-04 17:11:09 -07:00
Kevin Chyn
b979a38c8d Merge changes from topic "face-settings-challenge" into qt-r1-dev
* changes:
  Resolve challenge lifecycle race conditions
  Revert "Add generateChallenge() in onResume()"
2019-06-04 23:52:13 +00:00
Kevin Chyn
f20bb1c635 Resolve challenge lifecycle race conditions
1) FaceSettings now gets closed when it loses foreground. This prevents
   A) Keyguard/LockSettingsService's resetLockout's revokeChallenge from
   leaving FaceSettings with a stale HAT which prevents users from
   enrolling or toggling elements that require the HAT.
   B) generateChallenge has a timeout, which may already have been met
   C) User may have forgotten FaceSettings was open and lost context. Thus
   it makes no sense to show ConfirmLock* since the user may have no idea
   why it's showing anymore.

2) FaceSettings now generatesChallenge in onResume. onCreate is too early
   since again, FaceSettings can be launched via intent while on Keyguard.
   Similarly, we must ensure that Settings's challenge is generated
   late enough (e.g. when it actually gains foregroundness)

Fixes: 133440610
Fixes: 133498264

Test: Open face settings, confirm password, lock screen. After unlocking,
      user needs to re-open face settings.

Test: Modify HAL/framework to show re-enroll notification
      Tap re-enroll notificaton on keyguard
      Delete and re-enroll in settings, successful

Test: FaceSettings enroll works accross orientation change

Test: Tapping enroll button doesn't cause challenge to be revoked
      due to onStop()

Change-Id: I60f606314c458a61e9c1b4f4b66bc27bc44287da
2019-06-04 14:27:28 -07:00
Kevin Chyn
e716ce107d Revert "Add generateChallenge() in onResume()"
This reverts commit d59150eca6.

Bug: 133498264
Bug: 133440610

Reason for revert: Fixing in a different way

Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
2019-06-04 13:29:57 -07:00
Alexey Kuzmin
f8eb8c3c90 Move vibration preview invokation to the correct place
Bug: 133711461
Bug: 130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting

Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c
2019-06-04 15:44:43 +00:00
Alan Stokes
7b707bb204 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: dd1545b098
am: c912a02f50

Change-Id: I620a9a71c4495d1c4fd8db458ae0f3c8dd296f41
2019-06-04 07:53:23 -07:00
Alan Stokes
c912a02f50 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
am: dd1545b098

Change-Id: Iffc9d8bfa0469af6895496c4be8a4c45535c71f5
2019-06-04 07:43:00 -07:00
Alan Stokes
5b09f510e2 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
2019-06-04 07:38:04 -07:00
Alan Stokes
dd1545b098 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96
2019-06-04 07:38:00 -07:00
Alan Stokes
c53f5ecb3d Merge "Cleanup background activity starts for release." into qt-dev 2019-06-04 14:26:29 +00:00
Sunny Shao
2c6d308ecb Set the mAccountName as null while device has no any account
It doesn't clean the mAccountName buffer while device has no any account. And it will be put into
the Intent and pass to MeCard when user click the ghost boy avatar. It does not make sense and
modify code to fixed it.

Fixes: 129265427
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: Ib8cfab2cb416515018f335b21ef49a95699a1597
2019-06-04 15:56:18 +08:00
Antony Sargent
5217f29671 Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
am: 7a48cb470b

Change-Id: I8f9e97915fa3063d0a2f865ed749201fb404f5bc
2019-06-03 19:00:57 -07:00
Antony Sargent
7a48cb470b Add a "data during calls" preference am: aeb1da0db9
am: 7f7f7cda18

Change-Id: Iaafabc24ace39911ab3198cd705311595832cb5d
2019-06-03 18:47:56 -07:00
Antony Sargent
bffd3757e0 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
2019-06-03 18:39:54 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
2019-06-03 18:39:19 -07:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
Lei Yu
68c81d5b79 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 057dc8466a
am: 1fa5118618

Change-Id: Icf8db899a7e0f68082e6eaf61f3f1541d456d880
2019-06-03 10:15:47 -07:00
Lei Yu
1fa5118618 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 057dc8466a

Change-Id: If66ff93e4f4caddd9ebe62f9409812d4ed480c9b
2019-06-03 10:08:14 -07:00
Lei Yu
7f8a269a3a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
2019-06-03 10:06:14 -07:00
Lei Yu
057dc8466a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
2019-06-03 10:03:30 -07:00
Lei Yu
c9fbd2ee50 Merge "Use new API to build NetworkTemplate" into qt-dev 2019-06-03 16:54:29 +00:00
Fan Zhang
aa08a2cc0e Use slice uri from slice index db directly.
During SettingsSliceProvider#onGetSliceDescendants, use the uris from
database directly instead of getting the key and construct the uris
manually.

Bug: 126222433
Test: robotest
Change-Id: Iad4e9fc28ec4442b6bb323878503d743582b35ac
2019-05-31 16:03:33 -07:00
Joel Galenson
9e05bf902a Merge "Revert "Remove Permissions Hub."" into qt-r1-dev am: 4a9055a99c
am: efbf351167

Change-Id: Ib2dd0082d7b4b8d4d38fd6b3fdaa1c43eb94a69a
2019-05-31 15:34:06 -07:00
Joel Galenson
efbf351167 Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
am: 4a9055a99c

Change-Id: I90215bb8b92b6a5288647891bf5042e5a5802486
2019-05-31 15:04:56 -07:00
TreeHugger Robot
4a9055a99c Merge "Revert "Remove Permissions Hub."" into qt-r1-dev 2019-05-31 21:54:29 +00:00
Mehdi Alizadeh
793cb2c9c7 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: c4be5512a7
am: ecf3028123

Change-Id: I90f792dd3f24533411deafd15988b70278a7fd27
2019-05-31 14:43:50 -07:00
Mehdi Alizadeh
ecf3028123 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
am: c4be5512a7

Change-Id: I61477938f506b07ce01ad8d3b6214fb38df1936a
2019-05-31 14:34:09 -07:00
Mehdi Alizadeh
9b378dd381 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am: cad67cdc0a

Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
2019-05-31 14:30:18 -07:00
Mehdi Alizadeh
c4be5512a7 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am: cad67cdc0a

Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
2019-05-31 14:26:04 -07:00
Mehdi Alizadeh
cad67cdc0a Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev 2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488 Disables the Gesture nav option if 3P launcher is default
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.

Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest

Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
2019-05-31 12:26:28 -07:00
Lei Yu
09c60c349f Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: fad8cec592
am: a22bf1cd8b

Change-Id: Iaadee52c55098da5941dab5edfa1087dac7822c3
2019-05-31 11:10:26 -07:00
TreeHugger Robot
75a5ef8c16 Merge "Override 2 getSliceUri() instance to return platform slice" 2019-05-31 18:03:44 +00:00
Lei Yu
a22bf1cd8b Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
am: fad8cec592

Change-Id: I9b4a73685b8091760f375b58ad58d501046386d9
2019-05-31 10:53:59 -07:00