Android Build Merger (Role)
8f70c24f2d
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
...
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
2019-06-05 02:37:09 +00:00
Android Build Merger (Role)
e537ffece8
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
...
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
2019-06-05 02:37:07 +00: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
Bill Yi
c2ed23a180
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3d9c7cb356 -s ours
...
am: 7ff72e6d75
2019-06-04 18:20:00 -07:00
Alexey Kuzmin
58f21facff
Move vibration preview invokation to the correct place am: f8eb8c3c90
...
am: df51217157
2019-06-04 18:17:45 -07:00
Kevin Chyn
b11538ae73
Merge changes from topic "face-settings-challenge" into qt-r1-dev
...
am: b979a38c8d
2019-06-04 18:15:52 -07:00
Bill Yi
7ff72e6d75
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 3d9c7cb356
2019-06-04 18:09:12 -07:00
Alexey Kuzmin
df51217157
Move vibration preview invokation to the correct place
...
am: f8eb8c3c90
2019-06-04 18:00:48 -07:00
TreeHugger Robot
3d9c7cb356
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-05 00:23:38 +00: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
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
Bill Yi
3c85d10ef2
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I11c95502fa223dc53994a1dde87cc2400106b815
2019-06-04 08:36:03 -07:00
Alan Stokes
b6f4da68ca
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
...
am: dd1545b098
2019-06-04 07:47:35 -07:00
Alan Stokes
dd1545b098
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
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
Kevin Chang
515edfc5d8
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
...
am: 267321cd81
2019-06-03 18:52:01 -07:00
Antony Sargent
9d58d9a704
Add a "data during calls" preference am: aeb1da0db9
...
am: bffd3757e0
2019-06-03 18:49:41 -07:00
Kevin Chang
267321cd81
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
...
am: 68aa4e4919
2019-06-03 18:42:10 -07:00
Antony Sargent
bffd3757e0
Add a "data during calls" preference
...
am: aeb1da0db9
2019-06-03 18:39:54 -07:00
Kevin Chang
68aa4e4919
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
2019-06-04 01:29:21 +00:00
Lucas Dupin
d03a9828b9
Merge "Longer character limit" into qt-r1-dev
...
am: a448cb9d07
2019-06-03 15:58:55 -07:00
TreeHugger Robot
a448cb9d07
Merge "Longer character limit" into qt-r1-dev
2019-06-03 22:45:08 +00: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
Lucas Dupin
4e7dd01d0e
Longer character limit
...
Fixes: 134370077
Fixes: 134162233
Test: make
Change-Id: I3f697a093752faca37c4dc165857c97a6b1e410c
2019-06-03 11:33:50 -07:00
Lei Yu
f770bf78f5
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
...
am: 7f8a269a3a
2019-06-03 10:54:34 -07:00
Lei Yu
7f8a269a3a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
2019-06-03 10:06:14 -07:00
Lei Yu
c9fbd2ee50
Merge "Use new API to build NetworkTemplate" into qt-dev
2019-06-03 16:54:29 +00:00
Kevin Chang
ba2bdbc93a
Update the string of both magnification settings and gesture navigation tutorial dialog
...
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0
Bug: 133336814
Bug: 133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
2019-06-03 21:55:42 +08:00
Bill Yi
712c90abe1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: b53bebe6ec
2019-06-02 00:36:24 -07:00
TreeHugger Robot
907f2239bc
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-06-02 07:34:37 +00:00
TreeHugger Robot
b53bebe6ec
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-02 07:27:07 +00:00
Bill Yi
4083bbbefc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
...
am: 5540373d4f
2019-06-01 11:41:02 -07:00
Bill Yi
5540373d4f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 2407b65709
2019-06-01 11:36:05 -07:00
TreeHugger Robot
2407b65709
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-01 18:17:35 +00:00
Bill Yi
c3f412e385
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6f9fce5b981349174e0ca9480a237d8f118a8333
2019-06-01 10:46:42 -07:00
Bill Yi
79bc6c08a1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9675532a8f4b1f551c8130e9243262a52cd8a3d2
2019-06-01 10:26:48 -07:00
Bill Yi
6f9e016e2d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
2019-06-01 10:06:36 -07:00
Joel Galenson
a27d4a9f49
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
2019-05-31 15:02:30 -07:00
TreeHugger Robot
4a9055a99c
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
2019-05-31 21:54:29 +00:00
Mehdi Alizadeh
a9c1fa34c9
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: c4be5512a7
2019-05-31 14:32:18 -07:00
Mehdi Alizadeh
c4be5512a7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
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
Raff Tsai
50ec2c218e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f
2019-05-31 17:51:00 +00:00
Raff Tsai
5d9328571e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f
2019-05-31 17:50:17 +00:00
Julia Reynolds
1fb8ca0ace
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
...
am: 2c47160eff
2019-05-31 10:44:11 -07:00
Lei Yu
85820eb66f
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: 677d5a5e01
2019-05-31 10:43:51 -07:00
