Jonathan Scott
|
306ff7e3a9
|
[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
|
2019-05-08 16:09:26 -07:00 |
|
Jonathan Scott
|
9f280a15a2
|
[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
|
2019-05-08 15:43:07 -07:00 |
|
Android Build Merger (Role)
|
bd3672b2d8
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
|
2019-05-08 20:51:48 +00:00 |
|
Android Build Merger (Role)
|
333afb4357
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
|
2019-05-08 20:51:45 +00:00 |
|
Android Build Merger (Role)
|
003ce809c6
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
|
2019-05-08 20:51:43 +00:00 |
|
Android Build Merger (Role)
|
7d86790c7b
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
|
2019-05-08 20:51:40 +00:00 |
|
Android Build Merger (Role)
|
133337b4dc
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
|
2019-05-08 20:51:37 +00:00 |
|
Jonathan Scott
|
b985aa2f29
|
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
|
2019-05-08 20:51:35 +00:00 |
|
TreeHugger Robot
|
db98a8edec
|
Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
|
2019-05-08 20:00:27 +00:00 |
|
Christopher Dombroski
|
6b34347b4c
|
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94
am: 1d163af113
Change-Id: Icdbf3b7a403270384d92a0a9fed1326ca16b232f
|
2019-05-07 21:15:40 -07:00 |
|
Christopher Dombroski
|
1d163af113
|
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd
am: aebc5bbc94
Change-Id: Ia0b46cf2ff284b149df14451b04e1d2b935e4942
|
2019-05-07 20:20:44 -07:00 |
|
Christopher Dombroski
|
aebc5bbc94
|
Treat mode_default as denied for install_unknown_apps
am: 4b78bcd5cd
Change-Id: I09e4fa32947b51a6614012ae3f42062416ca086e
|
2019-05-07 19:14:43 -07:00 |
|
Jonathan Scott
|
687b18067c
|
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
Bug: 127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
|
2019-05-07 15:28:05 -07:00 |
|
Raff Tsai
|
04208f16b0
|
Do not allow draw on top for App notification settings
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
|
2019-05-03 12:14:35 +08:00 |
|
Raff Tsai
|
c968eacbbf
|
Do not allow draw on top for App notification settings
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
|
2019-05-03 03:12:32 +00:00 |
|
Raff Tsai
|
e4800786cf
|
Do not allow draw on top for App notification settings
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
|
2019-04-26 10:18:51 +08:00 |
|
Christopher Dombroski
|
4b78bcd5cd
|
Treat mode_default as denied for install_unknown_apps
Test: atest SettingsRoboTests
Bug: 123700348
Change-Id: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
Merged-In: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
|
2019-04-24 18:29:53 +00:00 |
|
Raff Tsai
|
9fa8329b02
|
Do not allow draw on top for App notification settings
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
|
2019-04-19 16:17:07 +08:00 |
|
Bill Yi
|
83d678bdc4
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
|
2019-04-05 12:44:47 -07:00 |
|
Rich Cannings
|
5d9189fab2
|
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
|
2019-03-28 21:15:33 +00:00 |
|
Bill Yi
|
e6d11ed962
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
|
2019-03-24 15:43:53 -07:00 |
|
Rich Cannings
|
34042bbf1d
|
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 b27c4308a2 )
|
2019-03-19 11:15:14 -07:00 |
|
Fan Zhang
|
1b29c28aef
|
[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
|
2019-03-08 15:07:53 -08:00 |
|
Fan Zhang
|
657f8713ff
|
[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
|
2019-03-08 15:01:41 -08:00 |
|
Fan Zhang
|
9366d11e6d
|
[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
|
2019-03-08 14:55:32 -08:00 |
|
TreeHugger Robot
|
decb412d5b
|
Merge "Do not allow draw on top for default sms picker." into nyc-dev
|
2019-03-08 22:34:09 +00:00 |
|
Bill Yi
|
02681df33f
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
|
2019-02-21 16:40:33 -08:00 |
|
Android Build Merger (Role)
|
ba87cf7444
|
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
|
2019-02-20 21:54:41 +00:00 |
|
Android Build Merger (Role)
|
d6bde3f5b8
|
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
|
2019-02-20 21:54:39 +00:00 |
|
Android Build Merger (Role)
|
7926131837
|
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
|
2019-02-20 21:54:37 +00:00 |
|
Android Build Merger (Role)
|
7a58589114
|
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
|
2019-02-20 21:54:34 +00:00 |
|
Android Build Merger (Role)
|
b810aee20f
|
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
|
2019-02-20 21:54:31 +00:00 |
|
Fan Zhang
|
95d0fb7f49
|
Do not allow draw on top for default sms picker.
Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe )
|
2019-02-20 13:53:51 -08:00 |
|
Bill Yi
|
e60e0d2291
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie074fc1d702ed2775866c82a126bd8efa8b2865b
|
2019-01-19 11:34:19 -08:00 |
|
Bill Yi
|
e18f734843
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
|
2019-01-12 23:00:35 -08:00 |
|
Bill Yi
|
9e39db9d62
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2fd8dffe12b55f223316b37c9c097194e7cf426f
|
2018-12-28 13:41:40 -08:00 |
|
Bill Yi
|
05cf17a925
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 118717573
Change-Id: Ifd74addec939651ce1aafca0d422f7fb65553a3a
|
2018-12-21 16:07:42 -08:00 |
|
Fan Zhang
|
b232d21e3d
|
[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
|
2018-11-20 02:43:38 -08:00 |
|
Fan Zhang
|
622444d488
|
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1
am: eeaff5deeb -s ours
Change-Id: I1da9e0c3e5a170eb16a11a616d8a76fe6424d420
|
2018-11-20 02:34:38 -08:00 |
|
Fan Zhang
|
eeaff5deeb
|
Hide quicksetting tile for dev options when it's turned off
am: 73469d9de1
Change-Id: Ibd19748e11218a958a00eaf501d9d8ab7cfc96e0
|
2018-11-20 02:28:15 -08:00 |
|
Fan Zhang
|
cb560b65f5
|
[automerger skipped] Hide quicksetting tile for dev options when it's turned off
am: 04f1e38dc3 -s ours
Change-Id: I3dfc8d889fb440846e4b70193350c665389f9b89
|
2018-11-19 22:38:50 -08:00 |
|
TreeHugger Robot
|
4c16ad5abf
|
Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
|
2018-11-20 05:00:03 +00:00 |
|
TreeHugger Robot
|
1ba1a70dfb
|
Merge "Import translations. DO NOT MERGE" into pi-dev
|
2018-11-14 00:49:33 +00:00 |
|
Bill Yi
|
0301470757
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic00cbf2b25c019d77c85c93203e58f4a1cf102c1
|
2018-11-13 14:42:50 -08:00 |
|
Fan Zhang
|
4220b1e50c
|
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
|
2018-11-13 09:22:06 +08:00 |
|
Edgar Wang
|
96d829be9a
|
Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev
|
2018-11-13 01:16:48 +00:00 |
|
Fan Zhang
|
73469d9de1
|
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
|
2018-11-12 20:25:51 +08:00 |
|
Fan Zhang
|
04f1e38dc3
|
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
|
2018-11-12 19:52:32 +08:00 |
|
Edgar Wang
|
bea5b289ff
|
Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
Merged-In: I0a0f03bdb27d9eea48eb758496eefeebcbc57b6c
Change-Id: If839a7199992104cc0abac9327844145d148cd68
Fixes: 118168552
Test: robotests
|
2018-11-09 11:24:48 +08:00 |
|
Fan Zhang
|
0eea3b6c9e
|
Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
|
2018-11-07 20:44:59 +00:00 |
|