OSDN Git Service
TreeHugger Robot [Mon, 10 Jun 2019 23:21:06 +0000 (23:21 +0000)]
Merge "Hide color mode in search during A11y" into qt-r1-dev
Kevin Chang [Mon, 10 Jun 2019 01:12:44 +0000 (18:12 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
am:
102d43b5c1
Change-Id: I12f498a313f5920940d49553f0c11c5619a7a4eb
Kevin Chang [Mon, 10 Jun 2019 00:57:14 +0000 (00:57 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
TreeHugger Robot [Sun, 9 Jun 2019 02:29:19 +0000 (02:29 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
b567faffaa -s ours
am skip reason: subject contains skip directive
Change-Id: If9388b9fa0837bee7929f3aa1227e6e3391215ba
TreeHugger Robot [Sun, 9 Jun 2019 00:31:00 +0000 (00:31 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 8 Jun 2019 19:26:23 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7b9956f00ad7c2e77e75dddb64a3ee70cc72fa78
Bill Yi [Sat, 8 Jun 2019 19:01:55 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If595c532cf6a8e9724c74c96b29356ab1bdb65b0
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am:
2bcfecdb21
Change-Id: I1108a0f097e7f6b1fc47f2551f18e6316688a8f9
TreeHugger Robot [Sat, 8 Jun 2019 06:41:11 +0000 (06:41 +0000)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
Kevin Chyn [Sat, 8 Jun 2019 04:07:07 +0000 (21:07 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am:
eeecb3e24d
Change-Id: I4d38ec9a0ffa4dbcffee9b5b7e31c20fd5bd3c7b
Kevin Chyn [Fri, 7 Jun 2019 22:44:49 +0000 (22:44 +0000)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
Kevin Chyn [Fri, 7 Jun 2019 22:13:29 +0000 (15:13 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
Fixes:
133822544
Test: No more multiple instances of fingerprint settings after enrolling
from within the settings page
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL does not
send the user to fingerprint settings after completing enrollment
Change-Id: I003dc142b01ed6ffae83299ab4b69f4896eb93e3
Kevin Chyn [Fri, 7 Jun 2019 19:41:05 +0000 (12:41 -0700)]
Do not stay on education page if user has enrolled max templates
Fixes:
134769754
Test: Enroll max templates, go back, intro screen is seen instead
Change-Id: I4a5f8d71abff88688f7c77860bb44caa95d17d61
Joshua Mccloskey [Fri, 7 Jun 2019 19:15:11 +0000 (19:15 +0000)]
Merge "Updating colors for dark theme" into qt-r1-dev
Lorenzo Colitti [Fri, 7 Jun 2019 06:18:21 +0000 (15:18 +0900)]
Disconnect if the user cancels the no/partial connectivity dialog
If the user exits the no Internet or partial connectivity dialog
without taking any action, there is no longer any way to use the
network. So, disconnect the network.
Bug:
130766237
Test: clicking outside dialog disconnects network
Test: orientation changes do not disconnect network
Change-Id: I80c2c98c994dc01e53b32f40332b3f1bd03b6012
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
Fix NFC state switched off every time user entered connection preferences page
NfcAirplaneModeObserver added a scenario that
switched NFC off every time a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.
GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.
Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.
Bug:
128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Merged-In: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
joshmccloskey [Thu, 6 Jun 2019 23:13:59 +0000 (16:13 -0700)]
Updating colors for dark theme
Bug:
133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2
Yi Jiang [Thu, 6 Jun 2019 20:06:21 +0000 (20:06 +0000)]
Merge "Fix screen attention contextual card" into qt-r1-dev
Julia Reynolds [Thu, 6 Jun 2019 19:00:54 +0000 (12:00 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am:
f58cd0fb51
Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7
TreeHugger Robot [Thu, 6 Jun 2019 18:36:57 +0000 (18:36 +0000)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am:
14a1b19735
Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475
Mehdi Alizadeh [Wed, 5 Jun 2019 22:34:50 +0000 (15:34 -0700)]
Updates System Navigation strings
Bug:
134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218
Julia Reynolds [Thu, 6 Jun 2019 15:18:24 +0000 (11:18 -0400)]
Silent notifs appear on lockscreen by default
Test: atest
Bug:
134613164
Change-Id: I1ee39a1302010a2a29ba6d0060f19565e41859a2
Kevin Chang [Fri, 31 May 2019 07:14:47 +0000 (15:14 +0800)]
Add tutorial dialog for gesture navigation
Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture
Fixes:
133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Merged-In: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Andy Chou [Thu, 6 Jun 2019 02:51:46 +0000 (19:51 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am:
a9e8c50764
Change-Id: I7e32848cd240b43e93533f5575202b1122620dee
Antony Sargent [Thu, 6 Jun 2019 02:51:13 +0000 (19:51 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am:
68a26e5535
Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a
Andy Chou [Thu, 6 Jun 2019 00:35:16 +0000 (00:35 +0000)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
Antony Sargent [Thu, 6 Jun 2019 00:19:16 +0000 (00:19 +0000)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
Yi Jiang [Wed, 5 Jun 2019 23:35:51 +0000 (23:35 +0000)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
Yi Jiang [Wed, 5 Jun 2019 03:14:10 +0000 (20:14 -0700)]
Fix screen attention contextual card
Bug:
134537004
Bug:
134537730
Test: Manually verified.
Test: make RunSettingsRoboTests
Change-Id: Ib5dd6444b70a5575863be985f58b48f00f505e53
Julia Reynolds [Wed, 5 Jun 2019 21:49:45 +0000 (14:49 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev
am:
3f95fda1cf
Change-Id: Icc507ca10f4c657593ed1c6b6cb9d93c0b01f8fe
TreeHugger Robot [Wed, 5 Jun 2019 21:37:17 +0000 (21:37 +0000)]
Merge "Read the subtext of notif importance field on selection" into qt-dev
Suprabh Shukla [Wed, 5 Jun 2019 21:34:45 +0000 (14:34 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied
am:
732edc3e39
Change-Id: I891d88a7fa0769ce22eb7b79cb5f6dcf5d1457ac
Antony Sargent [Wed, 5 Jun 2019 21:16:48 +0000 (14:16 -0700)]
Strings for pSIM on/off toggle removal
We need to remove the on/off toggle for pSIMs because of unexpected
problems in the telephony stack with being able to disable a pSIM. These
new strings are used in the updated UX we're adding to deal with this.
Bug:
132921553
Test: n/a
Change-Id: I60816289e0ef65bbf882a8dca6f08c46742bb1c9
Suprabh Shukla [Fri, 31 May 2019 20:45:59 +0000 (13:45 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied
Process privileges like open fds need to be revoked, when this
permission is denied by the user.
Test: Manually verified by checking logs.
Robotest:
atest SettingsRoboTests:ExternalSourcesDetailsTest
Bug:
133504844
Change-Id: I81da0b3a5d6c54e392828829d1a2c43488439504
TreeHugger Robot [Wed, 5 Jun 2019 20:25:31 +0000 (20:25 +0000)]
Merge "Hide color mode when unavailable" into qt-r1-dev
Yi Jiang [Tue, 4 Jun 2019 19:08:42 +0000 (12:08 -0700)]
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
Julia Reynolds [Wed, 5 Jun 2019 18:07:50 +0000 (14:07 -0400)]
Read the subtext of notif importance field on selection
When using a11y services
Test: manual with Talkback
Bug:
133649570
Change-Id: Ic68a948ab5d55e68994e6b14456d25d438637886
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:21:32 +0000 (11:21 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am:
13cbb2eea2
Change-Id: I9b9799889ce5e3474ccfcdd4b33dfafcd0092e0e
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:03:17 +0000 (18:03 +0000)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
Anthony Han [Wed, 29 May 2019 00:34:36 +0000 (17:34 -0700)]
Hide color mode in search during A11y
Bug:
133527869
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: Iac1146e6bfb391553b05f44fded2db17414b4605
Anthony Han [Fri, 24 May 2019 23:46:40 +0000 (16:46 -0700)]
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
TreeHugger Robot [Wed, 5 Jun 2019 15:30:52 +0000 (15:30 +0000)]
Merge "New strings for "Automatically lock"" into qt-r1-dev
Raff Tsai [Wed, 5 Jun 2019 09:36:08 +0000 (02:36 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours am:
3e1ae79428 -s ours am:
64d4433a90 -s ours
am:
acac31e75a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: Ib8f332a5ac80342106e25b07e5f40fb740fca033
Raff Tsai [Wed, 5 Jun 2019 09:35:44 +0000 (02:35 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
8c612b1334 -s ours am:
80fea5de92 -s ours am:
5a326027db -s ours am:
ba0122401d -s ours
am:
290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I591d8c07e4e21109315a9b7b600b52ba7000c3cc
Raff Tsai [Wed, 5 Jun 2019 09:35:02 +0000 (02:35 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours am:
e7c298885b -s ours
am:
ca593c204a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I4ef72ed7f78528edf72d003de251542d22515025
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:30:17 +0000 (02:30 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours am:
3e1ae79428 -s ours
am:
64d4433a90 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I0588eac0a4abcb1003b09e5fab92894a8ddfc8f9
Raff Tsai [Wed, 5 Jun 2019 09:29:51 +0000 (02:29 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
8c612b1334 -s ours am:
80fea5de92 -s ours am:
5a326027db -s ours
am:
ba0122401d -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: Ib7ded3d2c08e14e39922ad0f1dd1fb2dd3e27ab9
Raff Tsai [Wed, 5 Jun 2019 09:29:05 +0000 (02:29 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours
am:
e7c298885b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I4a6b3d7b7aaf30bf3abddf9b276e666462a9d831
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:25:23 +0000 (02:25 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours
am:
3e1ae79428 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: Ia0dc8b4e6b5795fb03c30867d77460389bb49155
Raff Tsai [Wed, 5 Jun 2019 09:24:54 +0000 (02:24 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
8c612b1334 -s ours am:
80fea5de92 -s ours
am:
5a326027db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I923b0a55fd8458fa30295fa1f9ca7a31f13d2734
Raff Tsai [Wed, 5 Jun 2019 09:22:55 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours
am:
0b36c5e9ba -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Id32040250480a5ad2e957eaeb4eea5b4dcc6633b
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
Edgar Wang [Wed, 5 Jun 2019 09:19:48 +0000 (17:19 +0800)]
New strings for "Automatically lock"
Bug:
132106803
Test: manual
Change-Id: If6fe328ef6570cd96906435eb635576b324269c0
Raff Tsai [Wed, 5 Jun 2019 09:19:30 +0000 (02:19 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours
am:
14302b3ac6 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: Ic1ddb22a97d9058d5e40b8fddfb3f6f4ef40e150
Raff Tsai [Wed, 5 Jun 2019 09:19:03 +0000 (02:19 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
8c612b1334 -s ours
am:
80fea5de92 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: Ic06c39295c0b1e82701cf1747606afff1e27fd68
Raff Tsai [Wed, 5 Jun 2019 09:17:52 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours
am:
c808f15cbe -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847
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:13:22 +0000 (02:13 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am:
09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407
Raff Tsai [Wed, 5 Jun 2019 09:12:49 +0000 (02:12 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am:
8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d
Raff Tsai [Wed, 5 Jun 2019 09:12:01 +0000 (02:12 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693
am:
65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd
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
TreeHugger Robot [Wed, 5 Jun 2019 09:02:31 +0000 (09:02 +0000)]
Merge changes from topic "security_fix_settings" into oc-dev
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e
Do not allow draw on top for App notification settings
TreeHugger Robot [Wed, 5 Jun 2019 09:02:31 +0000 (09:02 +0000)]
Merge changes from topic "security_fix_settings" into oc-dev
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e
Do not allow draw on top for App notification settings
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:10 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693
Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:07 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96
Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:04 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e
Change-Id: I5ed98836a8659baedf50724ce1f65c76bcace5ef
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: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
Malcolm Chen [Fri, 31 May 2019 22:35:08 +0000 (15:35 -0700)]
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
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: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: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
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:06:14 +0000 (10:06 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev
am:
c9fbd2ee50
Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
OSDN Git Service
