Commit Graph

91382 Commits

Author SHA1 Message Date
TreeHugger Robot
03b19e3f13 Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513 am: 25edbc5f5d am: ec959703ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: Ia1bff658f1b60ddcd6e6edc18a46af5d86884fbf
2021-07-02 11:38:51 +00:00
Alex Johnston
11430c4611 Merge "Remove credential management app Settings" into sc-dev am: 713d325310 am: abf5a1a2f1 am: cc2b5aa80b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I32fc1c4b47afebd0a731864bd73cfdccd1af0ea3
2021-07-02 11:38:29 +00:00
TreeHugger Robot
b07993285b Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513 am: 8718963d52 am: 0474160900
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: Ie3d20405b1894e00a46546529793e4d05163bafb
2021-07-02 11:38:19 +00:00
TreeHugger Robot
ec959703ec Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513 am: 25edbc5f5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: If9504c85a5472b892549d6ddd5f948ed5a130319
2021-07-02 11:34:09 +00:00
Alex Johnston
cc2b5aa80b Merge "Remove credential management app Settings" into sc-dev am: 713d325310 am: abf5a1a2f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I9fca4b9eb9a3c6475b3ae8b61d40dc343d6b2528
2021-07-02 11:25:50 +00:00
TreeHugger Robot
0474160900 Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513 am: 8718963d52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: I4d09edc3b2a7aee0f90a877b9a13b5c82eaa13bb
2021-07-02 11:25:45 +00:00
Alex Johnston
f2efb8f97b Merge "Remove credential management app Settings" into sc-dev am: 713d325310 am: 1dc52643b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I121b749a7a911bc788ef9eb7263fc31335ce4146
2021-07-02 11:25:06 +00:00
TreeHugger Robot
ab75884d1a Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513 am: 0fc4491c09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: Ifd122937471377b51b4c44db4ba874deb8aa6604
2021-07-02 11:24:57 +00:00
TreeHugger Robot
25edbc5f5d Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: I0d6d3f3ed6546ceafff322123cde483efb5f73b2
2021-07-02 11:16:19 +00:00
Alex Johnston
abf5a1a2f1 Merge "Remove credential management app Settings" into sc-dev am: 713d325310
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I27d1c919f05d0bf1e50844c47ed03938c0a18700
2021-07-02 11:15:46 +00:00
Alex Johnston
1dc52643b2 Merge "Remove credential management app Settings" into sc-dev am: 713d325310
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I7af2c7ad672a682c6974332a02cc98e3e3d6e2f2
2021-07-02 11:15:43 +00:00
TreeHugger Robot
0fc4491c09 Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: I8ab31b8c9d3be312c0500d036ef6e406c2f3c301
2021-07-02 11:15:33 +00:00
TreeHugger Robot
8718963d52 Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: I6e69fb82e1483ea6393540c1ca5888e12535be57
2021-07-02 11:15:24 +00:00
Alex Johnston
713d325310 Merge "Remove credential management app Settings" into sc-dev 2021-07-02 11:05:49 +00:00
TreeHugger Robot
74e1408513 Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev 2021-07-02 11:04:59 +00:00
TreeHugger Robot
01d4bb3359 Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375 am: 60ce579876 am: 44d58980c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

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

Change-Id: Ifd72e2e3b4fa343d7e0c9865b2568a171a77d512
2021-07-02 10:57:09 +00:00
Automerger Merge Worker
23d4629dff Merge "Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32 am: 0110423665" into sc-v2-dev-plus-aosp am: 096f336b5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229

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

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

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

Change-Id: Ia55410bfe45d75eedf1500cdeca976e5ceeddfbc
2021-07-02 10:56:30 +00:00
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
ce38106111 Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375 am: 82b4b46b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

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

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

Change-Id: I86e6806cf37736696aef427f1c8c59a3e5aad6f0
2021-07-02 10:35:27 +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
82b4b46b4f 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: I7b34a88cd94311db2193ac19453f21af57c60d66
2021-07-02 10:23:26 +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
440059f206 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: Id063e9f6e6554994d2e9716e9481cc09b777ccb3
2021-07-02 10:23:19 +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
1e7e8d8104 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: I5c5cef62674e470032312e1a0e9668607e460f73
2021-07-02 10:23:12 +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
45fa83c5e7 Merge "Update the illustration of NFC page." into sc-dev am: 14a31ce9d6 am: fa05e4e8c7 am: 7256679e7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15185254

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

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

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

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

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

Change-Id: I5d5ec842d700a5b9d6423bfcee2801e266855d01
2021-07-02 10:01:53 +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