OSDN Git Service
tmfang [Tue, 11 Jun 2019 17:45:44 +0000 (10:45 -0700)]
Fix overlapping problem on notification screen
am:
564fcb90ab
Change-Id: I22700badde84ab5a723b41d59fbd72a9f751452e
tmfang [Tue, 11 Jun 2019 05:56:56 +0000 (13:56 +0800)]
Fix overlapping problem on notification screen
If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.
So, user sees overlapped problem while user is scrolling view.
For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.
Test: visual, robotest
Fixes:
132819126
Change-Id: Ieb01b26e4d6ca4d82f72371620938665de8149a0
Kevin Chang [Mon, 10 Jun 2019 01:12:42 +0000 (18:12 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev
am:
102d43b5c1 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1
0e1f39fad8 is in history
Change-Id: I2539e4f01579937bfc201f1c0b3dfd55a0c79e56
Kevin Chang [Mon, 10 Jun 2019 00:57:14 +0000 (00:57 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-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: Ic5627d075ca460287a52b3b1d2a17c1fb61fa969
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: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: I556ca5d18af9ea673216d63bef71ee9ca66d66ad
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:06:08 +0000 (21:06 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am:
eeecb3e24d
Change-Id: I16becf1de78463e9379291f6273c963e850d4687
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
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: If4545377b7c6196027b89514a91a2b7068f1202b
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
Julia Reynolds [Thu, 6 Jun 2019 18:55:54 +0000 (11:55 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am:
f58cd0fb51
Change-Id: I446708aba61c268375257280341a1ff5b33aa81d
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: I86d6eab41c4c5d04d4311ce7699f55546f29cebf
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 [Thu, 6 Jun 2019 09:04:42 +0000 (09:04 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
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
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
Andy Chou [Thu, 6 Jun 2019 02:49:12 +0000 (19:49 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am:
a9e8c50764
Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91
Antony Sargent [Thu, 6 Jun 2019 02:47:52 +0000 (19:47 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am:
68a26e5535
Change-Id: I4d43b9a27284cf126c21ae7ab9089d2d79c0dc25
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
Julia Reynolds [Wed, 5 Jun 2019 21:49:41 +0000 (14:49 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev
am:
3f95fda1cf
Change-Id: I5829b1539c480e5c2f3598c57eb5bde7cdcd4d5f
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:46 +0000 (14:34 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied
am:
732edc3e39
Change-Id: Id88443ad3face92fa3d28622207c49f94c7eb002
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
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:33 +0000 (11:21 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am:
13cbb2eea2
Change-Id: I8ba31e7278d911bf6cef19e46d06ed964ae9e36f
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
Raff Tsai [Wed, 5 Jun 2019 09:36:10 +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: I2df0ab2ef87024ca20b4a05941505b581c27d8d7
Raff Tsai [Wed, 5 Jun 2019 09:35:45 +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: I7339c87760c9aac2c435178b03b62a936f498662
Raff Tsai [Wed, 5 Jun 2019 09:35:04 +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: I1030cc07ec491766f65c59fc45d8ceb8bc08a011
Raff Tsai [Wed, 5 Jun 2019 09:34:55 +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: I3703a33f61f1d3ee56d6223f680548e06d8ba997
Raff Tsai [Wed, 5 Jun 2019 09:34:38 +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: Iad7b242d3b85102d68ace5426ff9dd25cad04454
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
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:25:55 +0000 (18:25 -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: I87aca396c35ec9f0db74cb9079997a3995efbab5
Alexey Kuzmin [Wed, 5 Jun 2019 01:16:10 +0000 (18:16 -0700)]
Move vibration preview invokation to the correct place
am:
f8eb8c3c90
Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
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
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:04 +0000 (07:38 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev
am:
c53f5ecb3d
Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
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:41:08 +0000 (18:41 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am:
68aa4e4919
Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
Antony Sargent [Tue, 4 Jun 2019 01:39:19 +0000 (18:39 -0700)]
Add a "data during calls" preference
am:
aeb1da0db9
Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
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
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
Lei Yu [Mon, 3 Jun 2019 17:03:30 +0000 (10:03 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev
am:
c9fbd2ee50
Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
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 [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: Idd7efb56a6182a5374a0ce6cf5ea5114d98532ac
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:06:36 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
Mehdi Alizadeh [Fri, 31 May 2019 21:30:18 +0000 (14:30 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am:
cad67cdc0a
Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
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)
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:42:17 +0000 (10:42 -0700)]
Merge "Update notification settings animation" into qt-dev
am:
1746ccca94
Change-Id: If2fe2025fcdcecd6a432a76b4eac4545249b39dc
Lei Yu [Fri, 31 May 2019 17:41:54 +0000 (10:41 -0700)]
Merge "Fix issues in battery usage accounting" into qt-dev
am:
2148c1a207
Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
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:16:12 +0000 (09:16 -0700)]
Merge "Change switch text color to black in dark mode" into qt-dev
am:
ccbdd834ff
Change-Id: I933e00d2d75fbfe1c1d370f61df5b004bb99ec91
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
OSDN Git Service
