PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,362 Commits 1 Branch 0 Tags
86b7a16ae29be37f06cb7da90b8ccb63d5778b39
Commit Graph

91362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
7532c205e0 Merge "Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 am: 54a1f7b6bb" into sc-v2-dev-plus-aosp am: 6167aef9bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

Change-Id: I501e5115b1bb8d8a2a106c6b4a3e048c1ebb9d59
 2021-07-02 09:22:31 +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
TreeHugger Robot
8af3ca3d8d Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d am: 22cbf6cdde am: 4972f090d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

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

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

Change-Id: I68fb25acdd590ff833e154ae004488dd31efb81b
 2021-07-02 09:21:47 +00:00
Tom Hsu
b9079b7521 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: I58a406731a33fd63f5555259863327e96987b37b
 2021-07-02 09:21:34 +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
9dac23b37b Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 am: 831d02823c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

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

Change-Id: Id9520cb76d7bca2449f013d6f8e344fedb9c444f
 2021-07-02 09:07:58 +00:00
TreeHugger Robot
25854227de Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d am: e77a10c6e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: Id6ccd62924cc433f9eddb1ba3a2e70a74a6c29c1
 2021-07-02 09:07:51 +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
831d02823c 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: I9e617e42c9deb5aa1e1e0014e08dec8e089373cf
 2021-07-02 08:54:57 +00:00
Jernej Virag
4efb8652a8 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: I6da7f01d56a4abb156cf9200b3b4c04eb9ad3bfd
 2021-07-02 08:54:51 +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
e77a10c6e5 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: I54e9b7807c49e56624b2b8235f99120541af522f
 2021-07-02 08:54:38 +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
75b9cc3d21 Merge "Move selectability to switch from container" into sc-dev am: 235006fc35 am: cf423fbf96 am: 1423cffb6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

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

Change-Id: If942e506b8128f5871ab99d4afe100c450ece5ea
 2021-07-02 08:50:30 +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
a8cee3e24f Merge "Move selectability to switch from container" into sc-dev am: 235006fc35 am: 92928981f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

Change-Id: I983b8a6a80426a67adff66b4ee722b94f5e8c11f
 2021-07-02 08:35:25 +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
92928981f9 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: I46fa4127bce97256f86d1996de906c119a725f8b
 2021-07-02 08:19:18 +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
Stanley Wang
634f3d6655 Update the illustration of NFC page. 
- NFC uses the old component to display the illustration.
  Use the IllustrationPreference to display the illustration.

Fix: 192630194
Test: robotest and see the UI
Change-Id: Idcae247e0af039749dca072dd7fa44839b0b787d
 2021-07-02 15:39:29 +08:00
Jeremy Goldman
53dc808764 Merge "ManageablePreferenceTest created for VpnSettings" 2021-07-02 07:20:02 +00:00
TreeHugger Robot
db448e04b0 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 am: 8f3fadd898 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

Change-Id: If912268c364f85549dedb65685ef88b8ac96874f
 2021-07-02 07:11:02 +00:00
TreeHugger Robot
5661c73c7f 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 am: 74f747b1fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

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

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

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

Change-Id: I66a8bb70587ae35d4ef3a9a3e736caeb873102f5
 2021-07-02 07:00:07 +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