OSDN Git Service
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: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: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:
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
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)
Raff Tsai [Thu, 30 May 2019 01:40:29 +0000 (18:40 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am:
811229a2fd am:
fd058ab872 -s ours
am:
3fb5933880 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
9fa8329b02 is in history
Change-Id: I68b1c3e845c9f8cff305583b6cd19869e36cc027
Raff Tsai [Thu, 30 May 2019 01:35:24 +0000 (18:35 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am:
811229a2fd
am:
fd058ab872 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
e4800786cf is in history
Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b
Raff Tsai [Thu, 30 May 2019 01:30:24 +0000 (18:30 -0700)]
Merge "Do not allow draw on top for App notification settings" into oc-dev
am:
811229a2fd
Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4
Raff Tsai [Thu, 30 May 2019 01:28:27 +0000 (18:28 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
am:
b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
9fa8329b02 is in history
Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8
TreeHugger Robot [Thu, 30 May 2019 01:14:19 +0000 (01:14 +0000)]
Merge "Do not allow draw on top for App notification settings" into oc-dev
TreeHugger Robot [Thu, 30 May 2019 01:11:01 +0000 (01:11 +0000)]
Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
TreeHugger Robot [Thu, 30 May 2019 00:15:17 +0000 (00:15 +0000)]
Merge "Do not allow draw on top for App notification settings" into pi-dev
Bill Yi [Sat, 18 May 2019 13:44:53 +0000 (06:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I69697c36e862b2725dfd7fa1f542f9f7a3c6fa03
Jonathan Scott [Wed, 8 May 2019 23:25:48 +0000 (16:25 -0700)]
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357 am:
bd3672b2d8 am:
9f280a15a2
am:
306ff7e3a9 -s ours
am skip reason: subject contains skip directive
Change-Id: If66c539a683b4edeeca60140fb6c85eed1902d99
Jonathan Scott [Wed, 8 May 2019 23:09:26 +0000 (16:09 -0700)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357 am:
bd3672b2d8
am:
9f280a15a2
Change-Id: I2dae0b0e41b34480c99a81fd3c05014e5ec43f33
Jonathan Scott [Wed, 8 May 2019 22:43:07 +0000 (15:43 -0700)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357
am:
bd3672b2d8
Change-Id: I9157d6fd4afc3426142dbfbbdc9a57aceb2b7d7f
Android Build Merger (Role) [Wed, 8 May 2019 20:51:48 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
Android Build Merger (Role) [Wed, 8 May 2019 20:51:45 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
Android Build Merger (Role) [Wed, 8 May 2019 20:51:43 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
Android Build Merger (Role) [Wed, 8 May 2019 20:51:40 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
Android Build Merger (Role) [Wed, 8 May 2019 20:51:37 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
Jonathan Scott [Tue, 7 May 2019 16:20:00 +0000 (17:20 +0100)]
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
Bug:
127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
TreeHugger Robot [Wed, 8 May 2019 20:00:27 +0000 (20:00 +0000)]
Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
Christopher Dombroski [Wed, 8 May 2019 04:15:40 +0000 (21:15 -0700)]
Treat mode_default as denied for install_unknown_apps am:
4b78bcd5cd am:
aebc5bbc94
am:
1d163af113
Change-Id: Icdbf3b7a403270384d92a0a9fed1326ca16b232f
Christopher Dombroski [Wed, 8 May 2019 03:20:44 +0000 (20:20 -0700)]
Treat mode_default as denied for install_unknown_apps am:
4b78bcd5cd
am:
aebc5bbc94
Change-Id: Ia0b46cf2ff284b149df14451b04e1d2b935e4942
Christopher Dombroski [Wed, 8 May 2019 02:14:43 +0000 (19:14 -0700)]
Treat mode_default as denied for install_unknown_apps
am:
4b78bcd5cd
Change-Id: I09e4fa32947b51a6614012ae3f42062416ca086e
Jonathan Scott [Tue, 30 Apr 2019 14:52:52 +0000 (15:52 +0100)]
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
Bug:
127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
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)
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)
Christopher Dombroski [Tue, 16 Apr 2019 19:22:56 +0000 (12:22 -0700)]
Treat mode_default as denied for install_unknown_apps
Test: atest SettingsRoboTests
Bug:
123700348
Change-Id: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
Merged-In: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
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)
Bill Yi [Fri, 5 Apr 2019 19:44:47 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
Rich Cannings [Thu, 28 Mar 2019 21:15:33 +0000 (21:15 +0000)]
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
Bill Yi [Sun, 24 Mar 2019 22:43:53 +0000 (15:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
Rich Cannings [Tue, 19 Feb 2019 21:15:30 +0000 (13:15 -0800)]
DO NOT MERGE Refactor passwords/pins/patterns to byte[]
Relating to packages/apps/Settings
Bug:
120484642
Test: manual - test setting and unlocking passwords/pins/patterns.
automated - atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/
Change-Id: Idec8338d141c185bef67ade12035fdb2fa9d17ea
(cherry picked from commit
b27c4308a2ab839cff4f4751451440f6dc752e8e)
Fan Zhang [Fri, 8 Mar 2019 23:07:53 +0000 (15:07 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444 am:
9366d11e6d
am:
657f8713ff
Change-Id: I501ba68b3f6691a627a8828aeca16d495ee52126
Fan Zhang [Fri, 8 Mar 2019 23:01:41 +0000 (15:01 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444
am:
9366d11e6d
Change-Id: Icd4cf6000dd9d72f486417f1d11dde008d49c513
Fan Zhang [Fri, 8 Mar 2019 22:55:32 +0000 (14:55 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8
am:
ba87cf7444
Change-Id: I3b3a2411f4be05e1b8f6ecfce3521c5932028038
TreeHugger Robot [Fri, 8 Mar 2019 22:34:09 +0000 (22:34 +0000)]
Merge "Do not allow draw on top for default sms picker." into nyc-dev
Bill Yi [Fri, 22 Feb 2019 00:40:33 +0000 (16:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:41 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:39 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:37 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:34 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:31 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
Fan Zhang [Fri, 15 Feb 2019 00:07:37 +0000 (16:07 -0800)]
Do not allow draw on top for default sms picker.
Fixes:
120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit
9d46e1fdfe1b70618c5a92c3e3461a4b379db236)
Bill Yi [Sat, 19 Jan 2019 19:34:19 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie074fc1d702ed2775866c82a126bd8efa8b2865b
Bill Yi [Sun, 13 Jan 2019 07:00:35 +0000 (23:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
Bill Yi [Fri, 28 Dec 2018 21:41:40 +0000 (13:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2fd8dffe12b55f223316b37c9c097194e7cf426f
Bill Yi [Sat, 22 Dec 2018 00:07:42 +0000 (16:07 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
118717573
Change-Id: Ifd74addec939651ce1aafca0d422f7fb65553a3a
Fan Zhang [Tue, 20 Nov 2018 10:43:38 +0000 (02:43 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am:
73469d9de1 am:
eeaff5deeb -s ours
am:
622444d488 -s ours
Change-Id: I48cc472fb0d99b88f3affb69708f7107fe3ea2dc
Fan Zhang [Tue, 20 Nov 2018 10:34:38 +0000 (02:34 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am:
73469d9de1
am:
eeaff5deeb -s ours
Change-Id: I1da9e0c3e5a170eb16a11a616d8a76fe6424d420
Fan Zhang [Tue, 20 Nov 2018 10:28:15 +0000 (02:28 -0800)]
Hide quicksetting tile for dev options when it's turned off
am:
73469d9de1
Change-Id: Ibd19748e11218a958a00eaf501d9d8ab7cfc96e0
Fan Zhang [Tue, 20 Nov 2018 06:38:50 +0000 (22:38 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off
am:
04f1e38dc3 -s ours
Change-Id: I3dfc8d889fb440846e4b70193350c665389f9b89
TreeHugger Robot [Tue, 20 Nov 2018 05:00:03 +0000 (05:00 +0000)]
Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
TreeHugger Robot [Wed, 14 Nov 2018 00:49:33 +0000 (00:49 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 13 Nov 2018 22:42:50 +0000 (14:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic00cbf2b25c019d77c85c93203e58f4a1cf102c1
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Bug:
117770924
Test: robotests
Edgar Wang [Tue, 13 Nov 2018 01:16:48 +0000 (01:16 +0000)]
Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Bug:
117770924
Test: robotests
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Bug:
117770924
Test: robotests
Edgar Wang [Mon, 29 Oct 2018 12:22:11 +0000 (20:22 +0800)]
Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
Merged-In: I0a0f03bdb27d9eea48eb758496eefeebcbc57b6c
Change-Id: If839a7199992104cc0abac9327844145d148cd68
Fixes:
118168552
Test: robotests
Fan Zhang [Wed, 7 Nov 2018 20:44:59 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
Fan Zhang [Tue, 6 Nov 2018 23:21:07 +0000 (15:21 -0800)]
Fix crash when starting daydream setting with wrong context
The context must be a UI context. This is a new requirement in P.
Change-Id: I3e2de5068f44010da7d57af030e9f029dd97a7f8
Merged-In: I28874f296da617f4cedf6706b0663b76671f1780
Fixes:
111375261
Fixes:
113312592
Test: robotests
Bill Yi [Tue, 6 Nov 2018 12:15:12 +0000 (04:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie15195c81e11f67f4bd72be18c6af0d273666ceb
Bill Yi [Fri, 2 Nov 2018 22:27:05 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic830e9dc65c715010b562f0148821899114de819
Lei Yu [Thu, 25 Oct 2018 19:58:53 +0000 (19:58 +0000)]
Merge "Add entitlement check for usb tethering" into pi-dev
Doris Ling [Fri, 13 Jul 2018 19:32:00 +0000 (12:32 -0700)]
DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: I0fa8e3c9e02090d7d8a3e18608181ab73d2f46a1
Fixes:
118315852
Test: manual
Bill Yi [Wed, 17 Oct 2018 04:28:11 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
jackqdyulei [Tue, 2 Oct 2018 21:19:27 +0000 (14:19 -0700)]
Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API
Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.
Bug:
115707279
Test: RunSettingsRoboTests
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
Bill Yi [Mon, 15 Oct 2018 19:34:57 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
TreeHugger Robot [Wed, 10 Oct 2018 17:46:55 +0000 (17:46 +0000)]
Merge "Add null check for vrManager" into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 20:30:17 +0000 (20:30 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
Stanley Tng [Mon, 1 Oct 2018 05:47:22 +0000 (22:47 -0700)]
Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.
Bug:
116725094
Bug:
117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
TreeHugger Robot [Tue, 2 Oct 2018 00:53:40 +0000 (00:53 +0000)]
Merge changes from topic "hearing-aid" into pi-dev
* changes:
Add Feature Flag for Hearing Aid Profile
To show hearing aids device in the available devices group
Bill Yi [Sat, 29 Sep 2018 21:09:31 +0000 (14:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6d821fb3a3ccf99fa8f11e165773772ded38b608
TreeHugger Robot [Fri, 28 Sep 2018 19:00:35 +0000 (19:00 +0000)]
Merge "Refresh subscription info when subid changes" into pi-dev
Stanley Tng [Wed, 20 Jun 2018 22:32:02 +0000 (15:32 -0700)]
Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.
Bug:
116725094
Bug:
116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit
068c2547f6f877273b09bf3ace5b4a4b61c7647a)
timhypeng [Fri, 25 May 2018 06:01:02 +0000 (14:01 +0800)]
To show hearing aids device in the available devices group
Bug:
116725094
Bug:
116044083
Bug:
79553082
Test: make -j50 RunSettingsRoboTests
Change-Id: I8fe5eb653d332ef5ac4a566146f150774581167c
Merged-In: I8fe5eb653d332ef5ac4a566146f150774581167c
(cherry picked from commit
1c21bff1034b5124b69bda22c2fc9f70a449ffa7)
Fan Zhang [Fri, 27 Jul 2018 23:16:43 +0000 (16:16 -0700)]
Clean up task affinity.
If activity is launched through external intent, back button should just
go back to previous screen.
Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Merged-In: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Bug:
112254258
Fixes:
111864355
Test: manual
OSDN Git Service
