Commit Graph

85395 Commits

Author SHA1 Message Date
TreeHugger Robot
44d58980c1 Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375 am: 60ce579876
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

Change-Id: Ie9dc4e132920a9dbcddb5a4664939c4a7240f93f
2021-07-02 10:36:23 +00:00
Arc Wang
5406997440 Merge "Fix profile tab text contrast problem" into sc-dev am: 8c8b79dab5 am: 636602c313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165937

Change-Id: I922af2aff0166a66e6d41da0df0272375af4b892
2021-07-02 10:36:18 +00:00
Automerger Merge Worker
096f336b5a Merge "Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32 am: 0110423665" into sc-v2-dev-plus-aosp 2021-07-02 10:36:16 +00:00
Arc Wang
61edc98785 Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32 am: 0110423665
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229

Change-Id: Ib9999f399a4ad93da7eb77d6728508dc05a7ab15
2021-07-02 10:36:13 +00:00
TreeHugger Robot
1d270210cc Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375 am: 6f0e92afde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

Change-Id: I907abd7735ffa3cabb5453820a41074c84054e02
2021-07-02 10:36:10 +00:00
Arc Wang
ba41bfb521 Merge "Fix profile tab text contrast problem" into sc-dev am: 8c8b79dab5 am: 1966d6c336
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165937

Change-Id: I85ed053c2d843fe04ad20c4495bc29dc558fed32
2021-07-02 10:36:05 +00:00
Arc Wang
3c77faf5b0 Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32 am: e29c4da7d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229

Change-Id: I061511b776920ca570d1750c14abbaa836b873d1
2021-07-02 10:35:59 +00:00
TreeHugger Robot
6f0e92afde Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

Change-Id: Ieafa01327758d78166693dc77e02448426c0e1fb
2021-07-02 10:24:07 +00:00
Arc Wang
1966d6c336 Merge "Fix profile tab text contrast problem" into sc-dev am: 8c8b79dab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165937

Change-Id: Ia2d0cbbb99e3829976bf6783bdb575313cea2b3a
2021-07-02 10:24:02 +00:00
Arc Wang
e29c4da7d7 Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229

Change-Id: I86701b28608a679837dd10c838fb395411646b25
2021-07-02 10:23:57 +00:00
TreeHugger Robot
60ce579876 Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

Change-Id: I082d784eb75ab237d4a6c622d14fe3df1b7be97a
2021-07-02 10:23:21 +00:00
Arc Wang
636602c313 Merge "Fix profile tab text contrast problem" into sc-dev am: 8c8b79dab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165937

Change-Id: Iebdfb991505c05ecf7c265855af9cb78d73713e7
2021-07-02 10:23:15 +00:00
Arc Wang
0110423665 Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229

Change-Id: I522dcf99202b6ab757c930477c92d3068187d4df
2021-07-02 10:23:08 +00:00
TreeHugger Robot
68f3726375 Merge "Autofill settings: Fix search" into sc-dev 2021-07-02 10:12:18 +00:00
Arc Wang
8c8b79dab5 Merge "Fix profile tab text contrast problem" into sc-dev 2021-07-02 10:05:21 +00:00
Arc Wang
68caefba32 Merge "Fix incorrect storage size in Storage Settings" into sc-dev 2021-07-02 10:05:16 +00:00
Stanley Wang
7256679e7a Merge "Update the illustration of NFC page." into sc-dev am: 14a31ce9d6 am: fa05e4e8c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15185254

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

Change-Id: Ia58be6a327ed32ddb5c468a293fec3f611dd2ce4
2021-07-02 09:52:04 +00:00
Stanley Wang
fa05e4e8c7 Merge "Update the illustration of NFC page." into sc-dev am: 14a31ce9d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15185254

Change-Id: I5e9bbf4006778d69af115600f6471367cd5ff722
2021-07-02 09:49:07 +00:00
Stanley Wang
9baa4162eb Merge "Update the illustration of NFC page." into sc-dev am: 14a31ce9d6 am: 449bcaa53b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15185254

Change-Id: I14d46cc4f2f0149c072bcc1f0443b884e51566d8
2021-07-02 09:48:49 +00:00
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
TreeHugger Robot
b0de708916 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: I9d98cea24d562982bb87586c8dcd436cd39456af
2021-07-02 09:48:29 +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
Stanley Wang
449bcaa53b Merge "Update the illustration of NFC page." into sc-dev am: 14a31ce9d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15185254

Change-Id: I1384cc6fef14eab2f9876ad1d92e4d9ea1540864
2021-07-02 09:47:55 +00:00
Stanley Wang
14a31ce9d6 Merge "Update the illustration of NFC page." into sc-dev 2021-07-02 09:47:50 +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