Commit Graph

85437 Commits

Author SHA1 Message Date
TreeHugger Robot
b96605dbfb Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390 am: 8b946a48c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777

Change-Id: I7ac4996556cceb31f21c969954b9d5c1050ae8b3
2021-07-02 15:52:55 +00:00
TreeHugger Robot
8b946a48c6 Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777

Change-Id: I4c568bce7611c18da3460e13e182f8d49158ceb7
2021-07-02 15:37:19 +00:00
TreeHugger Robot
d5f9f65390 Merge "Switch back to sync IInputMethodManager" into sc-dev 2021-07-02 15:22:21 +00:00
Stanley Wang
c73ec5673e Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e am: ed113a13a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: I56c1c4169f88047ef8cb84ff46241ffce7c49058
2021-07-02 14:52:01 +00:00
Stanley Wang
ed113a13a6 Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: I937accc49da79a856614b892a4e7447e2ebd35c7
2021-07-02 14:36:30 +00:00
Joshua Mccloskey
f61582576e Merge "Refactored bad_calibration string" into sc-dev am: f68524f421 am: c248869813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157294

Change-Id: I30759839032803fac82f4c39a8d0a969c1c9d0ec
2021-07-02 14:29:23 +00:00
Stanley Wang
88e914e74e Merge "Update Adaptive brightness page." into sc-dev 2021-07-02 14:24:34 +00:00
Joshua Mccloskey
c248869813 Merge "Refactored bad_calibration string" into sc-dev am: f68524f421
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157294

Change-Id: I73ef5fd5b2fded5f75d34eedc715d1e7a7188bdf
2021-07-02 14:16:58 +00:00
Joshua Mccloskey
f68524f421 Merge "Refactored bad_calibration string" into sc-dev 2021-07-02 14:14:09 +00:00
Stanley Wang
d3ee311ab4 Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681 am: 8ec338480f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: Ia79a077f5cf3dc79a47a0e267efaba68874de819
2021-07-02 13:21:19 +00:00
Stanley Wang
6d903b19fb Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681 am: 0727b0e730
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: I8833fff766451648d327038236385e961d555201
2021-07-02 13:20:53 +00:00
Stanley Wang
8f774b908f Update Adaptive brightness page.
- Use the IllustrationPreference widget and update the
  new illustration.

Fix: 192415034
Test: robotest and see the UI
Change-Id: I2feb3faab0abd2fa0fc36b8bb94f6b02ec3f7dd7
2021-07-02 13:07:10 +00:00
Stanley Wang
0727b0e730 Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: I5938687eeea4e8886a41a242f860ea84c35e14b1
2021-07-02 13:03:52 +00:00
Stanley Wang
8ec338480f Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: Icd0f2235d966904192c4aec500fe7e48d0e17136
2021-07-02 13:03:08 +00:00
Stanley Wang
371f699681 Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev 2021-07-02 12:51:23 +00:00
TreeHugger Robot
3df301ea0d Merge "Update the dialog of SIM status and IMEI in About phone page" into sc-dev am: 71a3e2093c am: 335e58e0a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186115

Change-Id: I61ccd18307b79cb90ae4d16ce4c0c9d40c5b2a99
2021-07-02 12:17:26 +00:00
TreeHugger Robot
9b1328d829 Merge "Update the dialog of SIM status and IMEI in About phone page" into sc-dev am: 71a3e2093c am: 2580fd071f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186115

Change-Id: If2253bf95ff231d3b5bd81e97fd1827854300159
2021-07-02 12:17:00 +00:00
TreeHugger Robot
2580fd071f Merge "Update the dialog of SIM status and IMEI in About phone page" into sc-dev am: 71a3e2093c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186115

Change-Id: Ia78da4cef395b90e1e348ed33082f7473e747225
2021-07-02 12:04:18 +00:00
TreeHugger Robot
335e58e0a8 Merge "Update the dialog of SIM status and IMEI in About phone page" into sc-dev am: 71a3e2093c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186115

Change-Id: Iec1b3a95c90e87494152fc2af54ed5b91f3a4580
2021-07-02 12:03:32 +00:00
TreeHugger Robot
71a3e2093c Merge "Update the dialog of SIM status and IMEI in About phone page" into sc-dev 2021-07-02 11:52:29 +00:00
Joy Babafemi
03cf9a2c8a Merge "Remove UWB Toggle temporarily." into sc-dev am: 4664bd9684 am: 0041cab4e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15164283

Change-Id: I8ec10bac2c7cb30a39977b95bdac8b2310b42e06
2021-07-02 11:47:33 +00:00
Joy Babafemi
b24bbede09 Merge "Remove UWB Toggle temporarily." into sc-dev am: 4664bd9684 am: d9f25efe26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15164283

Change-Id: I38cefedc648495cd6d8e59b642ade0ca6d5baa81
2021-07-02 11:38:33 +00:00
Joy Babafemi
d9f25efe26 Merge "Remove UWB Toggle temporarily." into sc-dev am: 4664bd9684
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15164283

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

Change-Id: If22e0db05244613e34ca6fed2d84c60b51765029
2021-07-02 11:34:26 +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
Joy Babafemi
0041cab4e1 Merge "Remove UWB Toggle temporarily." into sc-dev am: 4664bd9684
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15164283

Change-Id: I21492c195282dca1185582dea0d307892d968c53
2021-07-02 11:33:44 +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
Joy Babafemi
4664bd9684 Merge "Remove UWB Toggle temporarily." into sc-dev 2021-07-02 11:21:42 +00:00
Alex Johnston
ea8d3c5341 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: I1f85ec552238cc3bf2dce3ba710af78aed691507
2021-07-02 11:16:26 +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
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
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