OSDN Git Service
Raff Tsai [Wed, 5 Jun 2019 09:39:50 +0000 (02:39 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours am:
f7cd796ea8 -s ours
am:
152f4c8345 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I054d479b143a56a77d6a59a2476da98115fad811
Raff Tsai [Wed, 5 Jun 2019 09:39:39 +0000 (02:39 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours am:
ab2ad075b3 -s ours
am:
05b744c5eb -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I747db90a98d307e148672bcd87ce254305c23bfd
Raff Tsai [Wed, 5 Jun 2019 09:34:53 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours
am:
f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I3cf51b30f82e33d55b49863d58fa27544a8ff0eb
Raff Tsai [Wed, 5 Jun 2019 09:34:37 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours
am:
ab2ad075b3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I04a28cd6ae30944bbf1c9208843fd5d8abf86beb
Raff Tsai [Wed, 5 Jun 2019 09:28:55 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours
am:
2d387349db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I27f9a530b3814c723726e43e8902651da3bfa937
Raff Tsai [Wed, 5 Jun 2019 09:28:42 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours
am:
971190b08a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ic3814c5b17fe748c35e11034d75549104e7de429
Raff Tsai [Wed, 5 Jun 2019 09:22:46 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours
am:
20b5a01f6c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I656e7e0fac7c63c55f82bfc01183e69adfe2164b
Raff Tsai [Wed, 5 Jun 2019 09:22:36 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours
am:
d20d75c39b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: If4596f7e943656ccb7bc06121fe77c5d6d76d627
Raff Tsai [Wed, 5 Jun 2019 09:17:44 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours
am:
530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23
Raff Tsai [Wed, 5 Jun 2019 09:17:35 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours
am:
59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d
Raff Tsai [Wed, 5 Jun 2019 09:11:52 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09
am:
bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae
Raff Tsai [Wed, 5 Jun 2019 09:11:36 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0
am:
6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5
Android Build Merger (Role) [Wed, 5 Jun 2019 02:48:34 +0000 (02:48 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0
Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:14 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09
Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:12 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631
Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:11 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d
Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:09 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:07 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
Bill Yi [Wed, 5 Jun 2019 01:20:00 +0000 (18:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
3d9c7cb356 -s ours
am:
7ff72e6d75 -s ours
am skip reason: subject contains skip directive
Change-Id: I030d28d9dd02264114d8f54739984f608508be5d
Alexey Kuzmin [Wed, 5 Jun 2019 01:17:45 +0000 (18:17 -0700)]
Move vibration preview invokation to the correct place am:
f8eb8c3c90
am:
df51217157
Change-Id: I132523ee4f89351a3538f5fd52cc346c87f414ed
Kevin Chyn [Wed, 5 Jun 2019 01:15:52 +0000 (18:15 -0700)]
Merge changes from topic "face-settings-challenge" into qt-r1-dev
am:
b979a38c8d
Change-Id: I96c6239728c9bf93a48be0dfb2a0a10ac607be72
Bill Yi [Wed, 5 Jun 2019 01:09:12 +0000 (18:09 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
3d9c7cb356 -s ours
am skip reason: subject contains skip directive
Change-Id: Id4ebeff5c481ede8d583bd59e4eabd1d3a7dcbe1
Alexey Kuzmin [Wed, 5 Jun 2019 01:00:48 +0000 (18:00 -0700)]
Move vibration preview invokation to the correct place
am:
f8eb8c3c90
Change-Id: I252301516d7be6b5026e4fba5b5e9144889f6b1f
TreeHugger Robot [Wed, 5 Jun 2019 00:23:38 +0000 (00:23 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Kevin Chyn [Tue, 4 Jun 2019 23:52:13 +0000 (23:52 +0000)]
Merge changes from topic "face-settings-challenge" into qt-r1-dev
* changes:
Resolve challenge lifecycle race conditions
Revert "Add generateChallenge() in onResume()"
Kevin Chyn [Tue, 4 Jun 2019 20:29:40 +0000 (13:29 -0700)]
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
Kevin Chyn [Tue, 4 Jun 2019 19:41:52 +0000 (19:41 +0000)]
Revert "Add generateChallenge() in onResume()"
This reverts commit
d59150eca6d7c0d0ea8a3fcba2a1add4beb36f05.
Bug:
133498264
Bug:
133440610
Reason for revert: Fixing in a different way
Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
Alexey Kuzmin [Tue, 4 Jun 2019 14:59:32 +0000 (15:59 +0100)]
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
Bill Yi [Tue, 4 Jun 2019 15:36:03 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I11c95502fa223dc53994a1dde87cc2400106b815
Alan Stokes [Tue, 4 Jun 2019 14:47:35 +0000 (07:47 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev am:
c53f5ecb3d
am:
dd1545b098
Change-Id: I7c5dda0627f62234daa0a060beebbcf6a950c9e7
Alan Stokes [Tue, 4 Jun 2019 14:38:00 +0000 (07:38 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev
am:
c53f5ecb3d
Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96
Alan Stokes [Tue, 4 Jun 2019 14:26:29 +0000 (14:26 +0000)]
Merge "Cleanup background activity starts for release." into qt-dev
Kevin Chang [Tue, 4 Jun 2019 01:52:01 +0000 (18:52 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am:
68aa4e4919
am:
267321cd81
Change-Id: I149734cb5f9cdbf1834132b7bb32adb1e30f4b78
Antony Sargent [Tue, 4 Jun 2019 01:49:41 +0000 (18:49 -0700)]
Add a "data during calls" preference am:
aeb1da0db9
am:
bffd3757e0
Change-Id: I5cf07a8942efcdba49808deb294cee5a7e614c2a
Kevin Chang [Tue, 4 Jun 2019 01:42:10 +0000 (18:42 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am:
68aa4e4919
Change-Id: I7db65e3ef0ed83e91a666a479cdbe8020aee763c
Antony Sargent [Tue, 4 Jun 2019 01:39:54 +0000 (18:39 -0700)]
Add a "data during calls" preference
am:
aeb1da0db9
Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
Kevin Chang [Tue, 4 Jun 2019 01:29:21 +0000 (01:29 +0000)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
Lucas Dupin [Mon, 3 Jun 2019 22:58:55 +0000 (15:58 -0700)]
Merge "Longer character limit" into qt-r1-dev
am:
a448cb9d07
Change-Id: Id19c3ab0ee93e06ed362dbd8fc64caf6ed804c58
TreeHugger Robot [Mon, 3 Jun 2019 22:45:08 +0000 (22:45 +0000)]
Merge "Longer character limit" into qt-r1-dev
Antony Sargent [Mon, 13 May 2019 23:44:13 +0000 (16:44 -0700)]
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
Lucas Dupin [Mon, 3 Jun 2019 16:34:25 +0000 (09:34 -0700)]
Longer character limit
Fixes:
134370077
Fixes:
134162233
Test: make
Change-Id: I3f697a093752faca37c4dc165857c97a6b1e410c
Lei Yu [Mon, 3 Jun 2019 17:54:34 +0000 (10:54 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev am:
c9fbd2ee50
am:
7f8a269a3a
Change-Id: I17f3bdd7d8e5c7e81cd3499770f907bad9dee532
Lei Yu [Mon, 3 Jun 2019 17:06:14 +0000 (10:06 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev
am:
c9fbd2ee50
Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
Lei Yu [Mon, 3 Jun 2019 16:54:29 +0000 (16:54 +0000)]
Merge "Use new API to build NetworkTemplate" into qt-dev
Kevin Chang [Wed, 29 May 2019 10:21:28 +0000 (18:21 +0800)]
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
Bill Yi [Sun, 2 Jun 2019 07:36:24 +0000 (00:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
b53bebe6ec -s ours
am skip reason: subject contains skip directive
Change-Id: I99943324fe056c8c53b645a2cd67e31e141c2ed9
TreeHugger Robot [Sun, 2 Jun 2019 07:34:37 +0000 (07:34 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
TreeHugger Robot [Sun, 2 Jun 2019 07:27:07 +0000 (07:27 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Sat, 1 Jun 2019 18:41:02 +0000 (11:41 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
2407b65709 -s ours
am:
5540373d4f -s ours
am skip reason: subject contains skip directive
Change-Id: If4c6db6757c44625ab4fa460201cc2aea6f90a52
Bill Yi [Sat, 1 Jun 2019 18:36:05 +0000 (11:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
2407b65709 -s ours
am skip reason: subject contains skip directive
Change-Id: I9ea5834b80b4ad5a6cf17c58186010acc11e85b4
TreeHugger Robot [Sat, 1 Jun 2019 18:17:35 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 1 Jun 2019 17:46:42 +0000 (10:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6f9fce5b981349174e0ca9480a237d8f118a8333
Bill Yi [Sat, 1 Jun 2019 17:26:48 +0000 (10:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9675532a8f4b1f551c8130e9243262a52cd8a3d2
Bill Yi [Sat, 1 Jun 2019 17:06:36 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
Joel Galenson [Fri, 31 May 2019 22:02:30 +0000 (15:02 -0700)]
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
am:
4a9055a99c
Change-Id: I8e1be721b46c0e8a4254b1bd942175dc26a6850d
TreeHugger Robot [Fri, 31 May 2019 21:54:29 +0000 (21:54 +0000)]
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
Mehdi Alizadeh [Fri, 31 May 2019 21:32:18 +0000 (14:32 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am:
cad67cdc0a
am:
c4be5512a7
Change-Id: I4f5926581904ac131c8e118d28f3696a20045e16
Mehdi Alizadeh [Fri, 31 May 2019 21:26:04 +0000 (14:26 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am:
cad67cdc0a
Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
Mehdi Alizadeh [Fri, 31 May 2019 21:08:08 +0000 (21:08 +0000)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
Mehdi Alizadeh [Wed, 15 May 2019 18:01:25 +0000 (11:01 -0700)]
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
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings
Fixes:
119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit
fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
Julia Reynolds [Fri, 31 May 2019 17:44:11 +0000 (10:44 -0700)]
Merge "Update notification settings animation" into qt-dev am:
1746ccca94
am:
2c47160eff
Change-Id: I0a50b3e9c7143e6c1f55d2eb5e6cf649dffe03c6
Lei Yu [Fri, 31 May 2019 17:43:51 +0000 (10:43 -0700)]
Merge "Fix issues in battery usage accounting" into qt-dev am:
2148c1a207
am:
677d5a5e01
Change-Id: I23bffc3adb3fdf8f256e0c79345e3e4c41667a85
Julia Reynolds [Fri, 31 May 2019 17:41:13 +0000 (10:41 -0700)]
Merge "Update notification settings animation" into qt-dev
am:
1746ccca94
Change-Id: I0901382721e411cdd3a3970fe85f13524853b944
Lei Yu [Fri, 31 May 2019 17:40:50 +0000 (10:40 -0700)]
Merge "Fix issues in battery usage accounting" into qt-dev
am:
2148c1a207
Change-Id: Ifd2d4c3928ba706071a575c28db21c7586a2e692
Julia Reynolds [Fri, 31 May 2019 17:27:09 +0000 (17:27 +0000)]
Merge "Update notification settings animation" into qt-dev
Lei Yu [Tue, 28 May 2019 17:05:44 +0000 (10:05 -0700)]
Use new API to build NetworkTemplate
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.
Bug:
133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
Lei Yu [Fri, 31 May 2019 17:17:51 +0000 (17:17 +0000)]
Merge "Fix issues in battery usage accounting" into qt-dev
Salvador Martinez [Fri, 31 May 2019 16:26:24 +0000 (09:26 -0700)]
Merge "Change switch text color to black in dark mode" into qt-dev am:
ccbdd834ff
am:
154c485209
Change-Id: I98d84d1dad3e6289fca7fd5d50d23ed4fdfcffae
Salvador Martinez [Fri, 31 May 2019 16:15:12 +0000 (09:15 -0700)]
Merge "Change switch text color to black in dark mode" into qt-dev
am:
ccbdd834ff
Change-Id: Ia64d44b5fd36823c1750ed8afc998f7619155824
TreeHugger Robot [Fri, 31 May 2019 15:59:42 +0000 (15:59 +0000)]
Merge "Change switch text color to black in dark mode" into qt-dev
Joel Galenson [Fri, 31 May 2019 14:54:20 +0000 (07:54 -0700)]
Revert "Remove Permissions Hub."
This reverts commit
1e7c172ad5704754266bee50a9bc59b3205e8b70.
Bug:
132292477
Test: None.
Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
Julia Reynolds [Fri, 31 May 2019 13:37:28 +0000 (06:37 -0700)]
Merge "Reorder notification settings" into qt-dev am:
1abcbaa093
am:
53bbf9b78d
Change-Id: I8222dd81d2b59e28b48486cf50fa5c04032e337f
Julia Reynolds [Fri, 31 May 2019 13:32:29 +0000 (06:32 -0700)]
Merge "Reorder notification settings" into qt-dev
am:
1abcbaa093
Change-Id: I0e6baba13bfeeee2bdb78b1eeb68f484e5c94b78
TreeHugger Robot [Fri, 31 May 2019 13:24:17 +0000 (13:24 +0000)]
Merge "Reorder notification settings" into qt-dev
Julia Reynolds [Fri, 31 May 2019 13:18:42 +0000 (09:18 -0400)]
Update notification settings animation
Test: manual
Fixes:
133874971
Change-Id: I8dc399f9de578197322cadbb7cc2c5f75902461d
Joel Galenson [Fri, 31 May 2019 13:12:23 +0000 (06:12 -0700)]
Merge "Remove Permissions Hub." into qt-dev am:
63088840c4
am:
58246f66db
Change-Id: Ife505d0629a8b1a593e8cbbfc177f8b0f21fd5b9
Joel Galenson [Fri, 31 May 2019 13:07:29 +0000 (06:07 -0700)]
Merge "Remove Permissions Hub." into qt-dev
am:
63088840c4
Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
TreeHugger Robot [Fri, 31 May 2019 13:02:12 +0000 (13:02 +0000)]
Merge "Remove Permissions Hub." into qt-dev
Lucas Dupin [Fri, 31 May 2019 04:27:13 +0000 (21:27 -0700)]
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
am:
1a3112ab32
Change-Id: Idc7ec9f2a32ac820dfeaffe5856245a1cc75864d
TreeHugger Robot [Fri, 31 May 2019 04:15:54 +0000 (04:15 +0000)]
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
Ilya Matyukhin [Fri, 31 May 2019 01:04:02 +0000 (18:04 -0700)]
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
am:
dbe399a023
Change-Id: I70923b19fa49fe61d6a150318c67c173452da4f2
TreeHugger Robot [Fri, 31 May 2019 00:52:11 +0000 (00:52 +0000)]
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
Bill Yi [Fri, 31 May 2019 00:47:50 +0000 (17:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
d1ddb16617 -s ours
am:
71edc54326 -s ours
am skip reason: subject contains skip directive
Change-Id: I75c7a3917bd554325f78bc2d5869be3a24cbafff
Bill Yi [Fri, 31 May 2019 00:42:52 +0000 (17:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
d1ddb16617 -s ours
am skip reason: subject contains skip directive
Change-Id: I86d2ea6736d4765940832bd48b4d37a9bb5046b7
TreeHugger Robot [Fri, 31 May 2019 00:30:42 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Joshua Mccloskey [Thu, 30 May 2019 23:34:49 +0000 (16:34 -0700)]
Merge "String update." into qt-r1-dev
am:
b471e2439c
Change-Id: Ie869a4b6edadcc5827707deb87076f9cbdb30c8a
Joshua Mccloskey [Thu, 30 May 2019 23:12:53 +0000 (23:12 +0000)]
Merge "String update." into qt-r1-dev
Alex Salo [Thu, 30 May 2019 23:12:36 +0000 (16:12 -0700)]
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
am:
fa127bd6f7
Change-Id: I3b67ce249e70c84af99d0af2aeac294c5f53bb4f
Alex Salo [Thu, 30 May 2019 22:59:12 +0000 (22:59 +0000)]
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
Mehdi Alizadeh [Thu, 30 May 2019 22:20:20 +0000 (15:20 -0700)]
Merge "Increase char limit to 60 for string translation" into qt-dev am:
178d4a7f8f
am:
4937d4ca1f
Change-Id: Ifc5a97ceebb4a284e54c58a75ad60ead6908af35
Bill Yi [Thu, 30 May 2019 22:17:06 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7
Mehdi Alizadeh [Thu, 30 May 2019 22:16:16 +0000 (15:16 -0700)]
Merge "Increase char limit to 60 for string translation" into qt-dev
am:
178d4a7f8f
Change-Id: I8369dc9dc525652253f4d5a8945725b09268470c
TreeHugger Robot [Thu, 30 May 2019 22:04:47 +0000 (22:04 +0000)]
Merge "Increase char limit to 60 for string translation" into qt-dev
Ilya Matyukhin [Thu, 30 May 2019 18:37:15 +0000 (11:37 -0700)]
Add generateChallenge() in onResume()
Fixes:
133498264
Fixes:
133440610
Test: open FaceSettings from Settings with and without an enrolled face
Test: open FaceSettings from the notification that asks to re-enroll
Change-Id: I80ca7644f96a538614962232fb3951d1a91d87c7
Lucas Dupin [Thu, 30 May 2019 21:49:24 +0000 (14:49 -0700)]
Fix exception on non face-enabled devices
Test: open privacy settings page
Bug:
130327302
Change-Id: I31ba9f30bb7300bff6daea8a51ed6c4dc2a373f2
Julia Reynolds [Thu, 30 May 2019 21:19:53 +0000 (14:19 -0700)]
Merge "Change notification alert icon" into qt-dev am:
2821456995
am:
72182e1ffc
Change-Id: Ia2c873cd36f661da5980b398a3c8fe28db358eaf
Salvador Martinez [Thu, 30 May 2019 21:16:52 +0000 (14:16 -0700)]
Change switch text color to black in dark mode
It seems that the attribute values that are used to text color
in the switch bar are selectors which leads to problems because
they include an alpha value when the switch is "off". This would
cause the contrast between the text and the background to be too
low for GAR. This CL simply makes it so that in dark mode the text
for the switch bar is just true black since adjusting the
attributes would have wide scale implications for all UIs using
device default themes.
Test: visual inspection
Bug:
132755745
Change-Id: I309db82e9bf020fb654e0b93f6ec84380ae092f7
Julia Reynolds [Thu, 30 May 2019 21:11:52 +0000 (14:11 -0700)]
Merge "Change notification alert icon" into qt-dev
am:
2821456995
Change-Id: I7b38e88e702ce91162f29592c69dcc4f8612181d
Julia Reynolds [Thu, 30 May 2019 20:52:08 +0000 (16:52 -0400)]
Reorder notification settings
Test: manual
Fixes:
132271798
Change-Id: I57e726a332513620bea25b97345b1a8564c6d5ef
OSDN Git Service
