PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,319 Commits 1 Branch 0 Tags
1c5abf415af03416b5da7fa2bc9541a201cd3045
Commit Graph

55319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Franks
ec8232bbcb [automerger skipped] Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f am: 31cc369a4d 
am: 4f05fc52bf -s ours
am skip reason: subject contains skip directive

Change-Id: I11180f4e77bd8f39bfc7385f9993ad09233a4091
 2019-08-04 02:19:46 -07:00
Christine Franks
1c10be0920 [automerger skipped] [DO NOT MERGE] Update title for null uri when setting changes am: ea14373666 am: c48918dac0 
am: c18d0d3090 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf8a51495910a768ff871b4a9dd5fbf9542826e8
 2019-08-04 02:17:24 -07:00
Christine Franks
095f746b85 [automerger skipped] Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f am: c586c923aa 
am: e4ffff1ce5 -s ours
am skip reason: subject contains skip directive

Change-Id: I316d380ddefe25c508fb9e780122019bfe23ad78
 2019-08-04 02:09:08 -07:00
Christine Franks
58f8945a42 [automerger skipped] [DO NOT MERGE] Update title for null uri when setting changes am: ea14373666 am: caebfbe9c9 
am: 3cb194c627 -s ours
am skip reason: subject contains skip directive

Change-Id: I21b43e30e3d44835adedccb1f23e9a39144e51e2
 2019-08-04 01:59:23 -07:00
Christine Franks
4f05fc52bf Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f 
am: 31cc369a4d

Change-Id: I0d5e1ef4822616b275f95cba16f3be03a8086973
 2019-08-04 01:38:30 -07:00
Christine Franks
c18d0d3090 [DO NOT MERGE] Update title for null uri when setting changes am: ea14373666 
am: c48918dac0

Change-Id: I3a48b53a963779a61c0608ee921d9f91280a04c3
 2019-08-04 01:37:51 -07:00
Christine Franks
8e7f23910f Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f 
am: 31cc369a4d

Change-Id: I578907b141f2a6a705473394e16519507997caa8
 2019-08-04 01:37:50 -07:00
Christine Franks
e4ffff1ce5 Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f 
am: c586c923aa

Change-Id: Ia18317e871e376f971335c65dedef59292852103
 2019-08-04 01:36:00 -07:00
Christine Franks
3cb194c627 [DO NOT MERGE] Update title for null uri when setting changes am: ea14373666 
am: caebfbe9c9

Change-Id: I488f73f99895fa4aa9e5ae23544684c56b69c78a
 2019-08-04 01:34:46 -07:00
Christine Franks
e003f38b53 [DO NOT MERGE] Update title for null uri when setting changes am: ea14373666 
am: c48918dac0

Change-Id: I268d4d01a515e1c49b83e3c321af230cb06bffc9
 2019-08-04 01:32:21 -07:00
Christine Franks
c586c923aa Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev 
am: 37b38f872f

Change-Id: I298f71e7db0840e83af06f5662d6af2d5c60bbac
 2019-08-04 00:55:55 -07:00
Christine Franks
caebfbe9c9 [DO NOT MERGE] Update title for null uri when setting changes 
am: ea14373666

Change-Id: I8f542126d98beefe8f221266b7f25bc9d7b0f4d5
 2019-08-04 00:55:33 -07:00
Christine Franks
31cc369a4d Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev 
am: 37b38f872f

Change-Id: Ie2b1e884d7501fb1d37ce816a5f4c78042be6300
 2019-08-04 00:53:35 -07:00
Christine Franks
c48918dac0 [DO NOT MERGE] Update title for null uri when setting changes 
am: ea14373666

Change-Id: Idca3e0d0855ced876f4bd891739e0141ec86a777
 2019-08-04 00:53:29 -07:00
Christine Franks
37b38f872f Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev 2019-08-03 14:47:40 +00:00
TreeHugger Robot
87ecb5deed Merge "Import RadioButtonPreference from SettingsLib" 2019-08-03 02:52:36 +00:00
Christine Franks
ea14373666 [DO NOT MERGE] Update title for null uri when setting changes 
Currently, the title will not update at all if set to silent.

Bug: 130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
 2019-08-03 01:00:31 +00:00
Raff Tsai
d68802cf6d Fix robolectric test error 
jobService is moved to mainline module. It is not registered in
the system at the beginning, therefore getSystemService returns
null. Instead of getSystemService, directly create a JobSchedulerImpl
and mock getSystemService method to return the JobSchedulerImpl
instance.

Fixes: 138714772
Test: make RunSettingsRoboTests
Change-Id: If91b6a63c0de92530d69f7b80515669352aab760
 2019-08-02 10:22:20 +00:00
TreeHugger Robot
c078ee3b5d Merge "Add Tapjacking Protection for SettingsHomepageActivity" 2019-08-02 06:32:01 +00:00
Edgar Wang
32b0ab179c Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp 
am: 1c98867b18

Change-Id: Iad2a374266f3c4c3595d6b1eb06b1433c03b161f
 2019-08-01 23:14:34 -07:00
Edgar Wang
677b943ae1 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 3448917d8e 
am: fc0aec7f1a

Change-Id: Icb23c10cf6f6b4bf4c8fcb81d23d1c2b8d7ddd33
 2019-08-01 23:13:14 -07:00
Android Build Merger (Role)
1c98867b18 Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp 2019-08-02 06:01:14 +00:00
Edgar Wang
73ae3701fc Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 
am: 063cc34713

Change-Id: I1f16586a9268f9afb6e8f85319ba03e91e5c98b4
 2019-08-01 23:00:28 -07:00
Edgar Wang
fc0aec7f1a Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 
am: 3448917d8e

Change-Id: Ib451284c689f984e8064af58ef538b34e8ec6784
 2019-08-01 23:00:21 -07:00
Edgar Wang
09f2469440 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 
am: 063cc34713

Change-Id: Ic856426092578e47418498de40e22aa484badb19
 2019-08-01 23:00:15 -07:00
Edgar Wang
3448917d8e Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 
am: 8e3b202070

Change-Id: Ic8c1eb744a1612fedd187902e65d7718500f4e8d
 2019-08-01 22:49:22 -07:00
Edgar Wang
063cc34713 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 
am: 8e3b202070

Change-Id: Ib1cf35ee24f88a9eae71714349fe40cb982214b0
 2019-08-01 22:49:22 -07:00
Edgar Wang
8e3b202070 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 2019-08-02 05:38:23 +00:00
Daniel Solomon
638e83263b Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 4c1fa1a5d1 
am: 2b40b40a95

Change-Id: I6ac505e1691008921ccd3819aab72c6cc205a123
 2019-08-01 14:25:07 -07:00
Daniel Solomon
8884ceecd0 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 8e699b6ec8 
am: 442a2b26b4

Change-Id: I47dd2dd53bcbdcc6570d0f53e4ee8385612127d6
 2019-08-01 14:19:20 -07:00
Daniel Solomon
2b40b40a95 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 
am: 4c1fa1a5d1

Change-Id: Iedf98f0f2b96ff79c567457c2aad7f2ef8e2e434
 2019-08-01 13:54:52 -07:00
Daniel Solomon
442a2b26b4 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 
am: 8e699b6ec8

Change-Id: I5fb775ba96631cbf9ac28b2c9946d2915ea99c10
 2019-08-01 13:53:32 -07:00
Daniel Solomon
6f2c664186 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 
am: 8e699b6ec8

Change-Id: I077cdf4c165158aa927f4d1aa0632b6c343b2fb2
 2019-08-01 13:51:28 -07:00
Daniel Solomon
8e699b6ec8 Merge "Settings: change the color mode preview image" into qt-r1-dev 
am: c5fbd7b669

Change-Id: I719cdde36a264519900584b9835d5c6e70cc5818
 2019-08-01 13:38:20 -07:00
Daniel Solomon
4c1fa1a5d1 Merge "Settings: change the color mode preview image" into qt-r1-dev 
am: c5fbd7b669

Change-Id: Icfc151ca32fa3ab44a68acc4732e3e9307372f22
 2019-08-01 13:37:33 -07:00
TreeHugger Robot
c5fbd7b669 Merge "Settings: change the color mode preview image" into qt-r1-dev 2019-08-01 19:58:47 +00:00
Youming Ye
9c8fe39c91 [automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f am: 84049d217d -s ours 
am: a427771754 -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f is in history

Change-Id: Ia380c3680e2de26f768df48c9cc92fc2fa5e7006
 2019-08-01 12:02:21 -07:00
Youming Ye
e4b53c55d2 Check the missing useHomeWfMode case am: b7923f5a3f 
am: 84049d217d

Change-Id: I101a0d837a4912e316c3cd25f6f829d15cbc8745
 2019-08-01 11:58:55 -07:00
Youming Ye
ac52b6f68d [automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f am: de8c3c5fd3 
am: 34599f661d -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 31608ace73 is in history

Change-Id: I2c0a12855188b0b33dd8b9da6a9688bcbff3c200
 2019-08-01 11:57:17 -07:00
Youming Ye
a427771754 [automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f 
am: 84049d217d -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f is in history

Change-Id: I3bf159aeec518e09d910ca4ec9c96dc74f68fae3
 2019-08-01 11:43:22 -07:00
Youming Ye
34599f661d Check the missing useHomeWfMode case am: b7923f5a3f 
am: de8c3c5fd3

Change-Id: I068d40471deb73869b0586e2bd4ebbba522ac85d
 2019-08-01 11:41:05 -07:00
Youming Ye
84049d217d Check the missing useHomeWfMode case 
am: b7923f5a3f

Change-Id: I81aadd772a8c8b07ca6c967868789aa91fe0dba9
 2019-08-01 11:27:48 -07:00
Youming Ye
de8c3c5fd3 Check the missing useHomeWfMode case 
am: b7923f5a3f

Change-Id: I8ffa6acb13e07b4a28b8f46b348ffc47c143a317
 2019-08-01 11:24:55 -07:00
Sunny Shao
647e49e7cf Add Tapjacking Protection for SettingsHomepageActivity 
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from
SettingsHomepageActivity and SettingsPanelActivity with lifecycle.

Bug: 138442483
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
      manual test
Change-Id: I72f9a947f57f74a8c09127d6c39173594c248ddc
 2019-08-01 23:36:12 +08:00
Raff Tsai
1ebf80446f Fix arabic language % character in wrong place 
info.batteryPercentString is applied language format.
We don't need to format it again in BidiFormatter.

Fixes: 136699046
Test: visual
Change-Id: Ie89823c23fd23bd6a9a97821f3062cad4dfb3709
 2019-08-01 18:31:13 +08:00
Raff Tsai
71a37d138b Import RadioButtonPreference from SettingsLib 
Bug: 138620011
Test: manual, robolectric
Change-Id: I3b8a2be021a1b4a07aae61483f2329b7a5bd4655
 2019-08-01 07:16:55 +00:00
Raff Tsai
5939f73740 Fix test case error 
Bug: 138714772
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core.codeinspection"
Change-Id: I10ff1983793e1e158eb72e93d838ccda97728084
 2019-08-01 12:22:03 +08:00
Edgar Wang
58a5be4401 Add skip lock screen in Notification & security lock screen settings 
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >

Bug: 138458558
Test: robotest & manual

Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
 2019-08-01 11:17:05 +08:00
Antony Sargent
8cb89e9d78 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9 am: e744ee1295 
am: afb537f589

Change-Id: Ibc1ed12d09551b67eb5090c58c166e1f3c3b3806
 2019-07-31 17:20:19 -07:00
Bill Yi
d49c3d90f4 [automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours am: f580528464 -s ours 
am: f3eb3758eb -s ours
am skip reason: subject contains skip directive

Change-Id: I73969c23c425ce9867d70347aa66d0d2b8aabea9
 2019-07-31 16:43:24 -07:00