PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,368 Commits 1 Branch 0 Tags
a0a5f8de48f8297708f29785373ca455b64f13cf
Commit Graph

85368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a0a5f8de48 Merge "Fix "notification" should be "notifications" in One-handed mode settings page" into sc-dev am: 2da798c50a am: 65e4bb2c28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186112

Change-Id: Id6d96618ba73aacd8feca37ab717f90da53c2350
 2021-07-02 09:48:44 +00:00
Tom Hsu
db165997bc Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f986580 am: ebb36d4126 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454

Change-Id: I4836fbe1edb13f9e4b22f560d2daca11763e53ec
 2021-07-02 09:48:30 +00:00
Tom Hsu
bd1e9fe0b4 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f986580 am: 2e4cb89e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454

Change-Id: Ied4ed485e3b255eb3d8e114d6070c8392f55ba9a
 2021-07-02 09:48:08 +00:00
TreeHugger Robot
65e4bb2c28 Merge "Fix "notification" should be "notifications" in One-handed mode settings page" into sc-dev am: 2da798c50a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186112

Change-Id: I7af33fa693709bd3645f25027fee307446c85a8e
 2021-07-02 09:47:37 +00:00
TreeHugger Robot
2da798c50a Merge "Fix "notification" should be "notifications" in One-handed mode settings page" into sc-dev 2021-07-02 09:36:58 +00:00
Tom Hsu
2e4cb89e76 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f986580 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454

Change-Id: Iaea1397d698d8352622d2701690695c412398b2f
 2021-07-02 09:22:21 +00:00
Tom Hsu
ebb36d4126 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f986580 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454

Change-Id: I8567ac8442256cd4beb0891fcfacb052a26e03b2
 2021-07-02 09:21:32 +00:00
Tom Hsu
c09f986580 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev 2021-07-02 09:10:51 +00:00
Jernej Virag
986458e8ed Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 am: 86a7aaf139 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

Change-Id: I99f220c6e8f2c7a6417603bc393f734da51c9cbd
 2021-07-02 09:09:11 +00:00
Jernej Virag
e7f9bc91bd Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd am: 73ac657abe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: Iac5de22db6120801edff6d539692071eba57afc8
 2021-07-02 09:08:59 +00:00
Automerger Merge Worker
6167aef9bc Merge "Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 am: 54a1f7b6bb" into sc-v2-dev-plus-aosp 2021-07-02 09:08:53 +00:00
Jernej Virag
e51c86ba28 Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 am: 54a1f7b6bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

Change-Id: Iebf4e0a50ce0e03eccf3f1852098603a3445b320
 2021-07-02 09:08:46 +00:00
TreeHugger Robot
4972f090d4 Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d am: 22cbf6cdde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: I7a4ad2d6420d69baccb213b9f78c236ead565e00
 2021-07-02 09:08:45 +00:00
Jernej Virag
875aba5a82 Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd am: ada2302bd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: I24fd65026297fd671207a18705e215730eadf2b8
 2021-07-02 09:08:35 +00:00
TreeHugger Robot
14cbf021fd Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d am: febdfba6e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: I0692f3de1e61c12fef73d08a0072f99335dc9ad7
 2021-07-02 09:08:30 +00:00
Jernej Virag
54a1f7b6bb Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

Change-Id: Id323fd7afeef2718283ca765265ad0e895967ca1
 2021-07-02 08:56:11 +00:00
Jernej Virag
ada2302bd6 Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: I2f628c75668f6596104450446ccb1e29fa0c1e84
 2021-07-02 08:56:01 +00:00
TreeHugger Robot
febdfba6e4 Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: I55d8906c1f910cf658d55fcb2a273e80bf8c691d
 2021-07-02 08:55:51 +00:00
Jernej Virag
86a7aaf139 Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

Change-Id: I0626d3a888c1880f64affa523adf837ecede970a
 2021-07-02 08:55:01 +00:00
Jernej Virag
73ac657abe Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: I37862d807713adbbd721e832a7ba17cfa97c49ca
 2021-07-02 08:54:50 +00:00
TreeHugger Robot
22cbf6cdde Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: I69b126f7af645331a2b4815bcb3aa9133ede1cfd
 2021-07-02 08:54:31 +00:00
Jernej Virag
555d127af5 Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev 2021-07-02 08:51:56 +00:00
Jernej Virag
1d2371eecd Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev 2021-07-02 08:51:17 +00:00
TreeHugger Robot
e6cff5497d Merge "Password settings: Fix work profile" into sc-dev 2021-07-02 08:42:26 +00:00
TreeHugger Robot
1423cffb6a Merge "Move selectability to switch from container" into sc-dev am: 235006fc35 am: cf423fbf96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

Change-Id: Ifbeb33246358ef9e9e9534a57de223a41b5cb502
 2021-07-02 08:36:14 +00:00
TreeHugger Robot
5046ed6a6a Merge "Move selectability to switch from container" into sc-dev am: 235006fc35 am: cbc37a271a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

Change-Id: I5a1f61b64afda36d49693efc7066a0f46932727f
 2021-07-02 08:35:53 +00:00
TreeHugger Robot
cbc37a271a Merge "Move selectability to switch from container" into sc-dev am: 235006fc35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

Change-Id: Ifc08b76bdc2776709193d8caac1ac95afce1860e
 2021-07-02 08:20:06 +00:00
TreeHugger Robot
cf423fbf96 Merge "Move selectability to switch from container" into sc-dev am: 235006fc35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

Change-Id: I2358bbcd3186012e583c8357ecbd5893deeea9a6
 2021-07-02 08:19:14 +00:00
Jason Chang
23345bcbfb Fix "notification" should be "notifications" in One-handed mode 
settings page

Change "notification" to "notifications" for wrong string.

Bug: 192345310

Test: manual verified on System > Gestures > One-handed mode page
Change-Id: I9cf49a2a037483b118027488f36669b9db26a21e
 2021-07-02 16:17:49 +08:00
TreeHugger Robot
235006fc35 Merge "Move selectability to switch from container" into sc-dev 2021-07-02 08:03:25 +00:00
TreeHugger Robot
8f3fadd898 Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd am: 593ab6faab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

Change-Id: I4b21c309830c569bb03a641ce059a753600c0cff
 2021-07-02 06:53:05 +00:00
TreeHugger Robot
74f747b1fd Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd am: a74806eec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

Change-Id: Ic6a4b06ecc3621a535b588547399a9c4a48ebeda
 2021-07-02 06:52:42 +00:00
George Chang
224957b42b Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a am: 3096bae20d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: I89e154504f23787eb457b764c451edbe744d8a86
 2021-07-02 06:52:34 +00:00
TreeHugger Robot
a74806eec9 Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

Change-Id: I58e0b0ed4c7af6e0dddfe854ecb4e7b22790a9ae
 2021-07-02 06:52:25 +00:00
George Chang
ab28ada66b Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a am: 873084ac09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: I7a7f98b1abc85905b5ad20ec1dc4ae7cb4058ce7
 2021-07-02 06:52:21 +00:00
TreeHugger Robot
593ab6faab Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

Change-Id: If5ffafd6426bd6d942b8a44fa1dd2c7317c31af0
 2021-07-02 06:42:28 +00:00
TreeHugger Robot
f1b07d7ddd Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev 2021-07-02 06:40:15 +00:00
George Chang
3096bae20d Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: Ic46613a626882f06ac273c1cfb9dc1020889db33
 2021-07-02 06:38:16 +00:00
George Chang
873084ac09 Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: Ibff4d86ddb896db29ac248205c0a410634365ec1
 2021-07-02 06:34:09 +00:00
George Chang
cd4a4ad90a Merge "Separate NFC on/off strings" into sc-dev 2021-07-02 06:23:03 +00:00
TreeHugger Robot
867b9eb6d1 Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26 am: 58d95b41c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: I6ae382f07d9b35a36a804a79f4bbb9f664635321
 2021-07-02 05:52:33 +00:00
TreeHugger Robot
a60344a35a Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5 am: 33a9e928fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945

Change-Id: I4b7aee6791c35a07da6636dc95b6c39b016a2d89
 2021-07-02 05:52:21 +00:00
TreeHugger Robot
096f77298b Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26 am: 0b95e8c9c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: Ieb069a51f1a5d0f30fa215ec8cbd3a450cc01dfa
 2021-07-02 05:52:03 +00:00
TreeHugger Robot
de02870306 Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5 am: d30e518f0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945

Change-Id: I091bedaccfde3ee417d2e9da758583495ce10b1d
 2021-07-02 05:51:59 +00:00
TreeHugger Robot
0b95e8c9c7 Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: I7970a92d9fcdd207e60487d84acd22177cab4563
 2021-07-02 05:39:07 +00:00
TreeHugger Robot
d30e518f0c Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945

Change-Id: I98d9a9a04064e9d599f33ee585f020bdd6c248a7
 2021-07-02 05:39:01 +00:00
TreeHugger Robot
58d95b41c9 Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: If663e6bfecc6c0576c8b619f16223d0fd23229f4
 2021-07-02 05:38:18 +00:00
TreeHugger Robot
33a9e928fb Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945

Change-Id: Ie661943ee6352757a03f928c9db6e729927a8b7e
 2021-07-02 05:38:12 +00:00
TreeHugger Robot
77f0dbaa26 Merge "Correct the choose screen lock page" into sc-dev 2021-07-02 05:26:38 +00:00
TreeHugger Robot
65c9b03fb5 Merge "Fix multiple biometrics enrollment flow" into sc-dev 2021-07-02 05:26:18 +00:00