PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,260 Commits 1 Branch 0 Tags
c8cc41b2264544e23d6587a5b5343ab33e9c953c
Commit Graph

84260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
c8cc41b226 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295

Change-Id: I760cbb29865295678a5033e58c9412d1ab9af51c
 2021-06-28 05:42:20 +00:00
Bonian Chen
f4a80fdfa3 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev 
* changes:
  Revert "[Settings] Fix build breakage"
  Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
 2021-06-28 05:28:07 +00:00
Bonian Chen
4c4d8e3a08 Revert "[Settings] Fix build breakage" 
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ifb1a579863df157b41aebbdf59ad7e4584efa866
 2021-06-28 05:23:33 +00:00
Bonian Chen
69fc8e0ccd Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..." 
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394
 2021-06-28 05:23:33 +00:00
TreeHugger Robot
6fbeadac34 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I78d5afe93092c4ca5f874177e56ad1cc73620384
 2021-06-28 04:38:44 +00:00
TreeHugger Robot
3d5fd19e9f Merge "Consistent color between status bar and app bar" into sc-dev 2021-06-28 04:25:09 +00:00
Bonian Chen
f6e9f00332 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I6888257ca0fb942c1e388448cb71466000bdabe3
 2021-06-28 04:03:14 +00:00
Bonian Chen
f03086e9db [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: Iea5aafb8e04dfbed3c9d3d132508161c31bbecc1
 2021-06-28 04:03:12 +00:00
Bonian Chen
c437177d4b Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev 2021-06-28 03:59:43 +00:00
Bonian Chen
bf4120f3f8 Merge "[Settings] Fix build breakage" into sc-dev 2021-06-28 03:59:43 +00:00
Arc Wang
d7a57a59d6 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I6ce40af99f6494a915040e662c86ad0e93444110
 2021-06-28 03:57:13 +00:00
Arc Wang
3625cf50aa Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev 2021-06-28 03:43:59 +00:00
TreeHugger Robot
194c2a8c0a Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I77608d1b291e07ed8034450b89bb08bf2328d4be
 2021-06-28 03:24:15 +00:00
TreeHugger Robot
0bea498ae1 Merge "Fix switch behavior with switch access" into sc-dev 2021-06-28 03:01:29 +00:00
Arc Wang
465560d388 Shows ripple effect inside CardPreference's rounded rectangle 
contextual_card_background is a drawable which shows ripple.
Sets contextual_card_background as the foreground of
MaterialCardView.

Bug: 191617809
Test: manual visual
Change-Id: I09ee886fe56e443626042682381560ed0f32d51d
 2021-06-27 15:59:18 +00:00
TreeHugger Robot
d89e093b0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115842

Change-Id: I1926e256a90e2cbf545b0d226759765a026744c5
 2021-06-26 05:18:48 +00:00
TreeHugger Robot
6de3887716 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours am: e78163f7c7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834

Change-Id: I3bab0563590d52f04f1331d1140e3cdc64c7a3af
 2021-06-26 05:18:44 +00:00
Bill Yi
fbb0783097 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032

Change-Id: Idf63a94f20b9ff08dc4f258849445ffe5d422acc
 2021-06-26 05:18:38 +00:00
TreeHugger Robot
1060b2f926 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 05:16:50 +00:00
TreeHugger Robot
e78163f7c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834

Change-Id: I582c95f5d4f7e1ae9ec4b3e4914e0ba4891242bb
 2021-06-26 05:15:41 +00:00
Bill Yi
4621b36198 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032

Change-Id: Ia2f670479503f1f1c2aacb2d04d7d0d7c5814cb7
 2021-06-26 05:15:33 +00:00
TreeHugger Robot
75075b106e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837

Change-Id: I019ec88ca84edabf398c7ce8f653b5152cc5d461
 2021-06-26 05:15:30 +00:00
Bill Yi
752d115af3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838

Change-Id: I260cd61b3cdec9423743033b427a70f4301ddc2e
 2021-06-26 05:15:19 +00:00
TreeHugger Robot
28dbcbf459 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-26 05:13:39 +00:00
TreeHugger Robot
ce6e84f830 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837

Change-Id: I88919988edfdee2caa05df3317f351e903e10f31
 2021-06-26 05:11:35 +00:00
TreeHugger Robot
9fa5aba57d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417

Change-Id: I056e3a2e607750f4431a58bf2f2876ff5aec6028
 2021-06-26 05:11:23 +00:00
Bill Yi
28cd196a94 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838

Change-Id: I54ab7d9f2758a59cf18c6e1cdfb8eebb47a387d9
 2021-06-26 05:11:20 +00:00
TreeHugger Robot
7a2b7d7dbd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-26 05:11:09 +00:00
TreeHugger Robot
240df19188 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-26 05:02:57 +00:00
TreeHugger Robot
b92673984b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-26 05:01:37 +00:00
TreeHugger Robot
edea8a6799 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 04:58:47 +00:00
Bill Yi
3d56d7be5c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1be53c98eb342d9fa588e3c953bf34cd9d12ba75
 2021-06-26 03:33:56 +00:00
Bill Yi
9f28edb782 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1fcdc5845232e672d3eb3a28aaf1c094886a3f09
 2021-06-26 03:23:44 +00:00
Bill Yi
130e0ec1ba Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9e83b41c6c7836d1189d68db61d17f4261f4f920
 2021-06-26 03:19:15 +00:00
Bill Yi
4f307c462f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If1e176b4aecb4b1db470d97eb30501c75f893dfe
 2021-06-26 03:15:46 +00:00
Bill Yi
4807ff8a84 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8fc0d492b2e23f8c1d01b97b6d551bc818b63873
 2021-06-26 03:11:20 +00:00
Bill Yi
aa649a6fe5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1b011f8ce25dbc3fdb374eddf0b9c13015907427
 2021-06-26 03:07:35 +00:00
Bill Yi
b76c7bcd31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id512e5ce55b9772c2fdaeeaabb9bbfbab0e10a90
 2021-06-26 03:04:02 +00:00
Bill Yi
ef757416ab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I35a2f4eb8cce153bb6829fefd265c2f9251fca8b
 2021-06-26 03:02:32 +00:00
Joshua Mccloskey
825141c44f Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972

Change-Id: Ib83ae30cf25ad2f08e7b8ca75c8e0b5e6383dcf1
 2021-06-25 22:40:27 +00:00
Joshua Mccloskey
477c5d9cde Merge "Updated fp bad calibration string" into sc-dev 2021-06-25 22:37:01 +00:00
Curtis Belmonte
ff05ace156 Update strings for choose lock password/pattern screen am: 4aa1e532db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893

Change-Id: I179150369d8734180cd504daa1a8738e395875e7
 2021-06-25 22:02:57 +00:00
Curtis Belmonte
4aa1e532db Update strings for choose lock password/pattern screen 
Makes the following changes to the header/description text shown on the
choose lock screen:
- Remove references to "biometrics" in favor of "face or fingerprint"
- Add a default description when setting a PIN/pattern/password

Test: Manual

Bug: 191923052
Change-Id: I788fd03aaeea624fab548d1c055c5c6dee076e2d
 2021-06-25 12:59:47 -07:00
Julia Reynolds
dc5649a529 Fix switch behavior with switch access 
Test: manual with talkback, switch access, and no a11y aid
Fixes: 189074205
Change-Id: I95c1d0e9c2f82122e224399c6261ad2198901e04
 2021-06-25 14:33:59 -04:00
Joshua Mccloskey
05689a3432 Updated fp bad calibration string 
Test: Verified string was present during enrollment error.
Bug: 189133688
Change-Id: Ia9a447c443fa0784c736e171a2e1840fed55034c
 2021-06-25 18:32:19 +00:00
Julia Reynolds
8d4d54998d Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118

Change-Id: Ia5ab926a59272d2940522e69319dc1b13dcb85c2
 2021-06-25 15:07:38 +00:00
Julia Reynolds
3d22e9775a Merge "Disable additional pkgs on DND perm page" into sc-dev 2021-06-25 14:56:13 +00:00
Julia Reynolds
4c7981eb0d Disable additional pkgs on DND perm page 
Because they will always have access because they hold
the permission to manage notifications.

Test: manual
Fixes: 191973668
Change-Id: I456aec41b401bba6f10d9ea969e2fb8c4300825d
 2021-06-25 09:17:41 -04:00
Bonian Chen
ea951aab42 Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" 
This reverts commit 7b8e05adab.

Reason for revert: add missing file back to CL

Bug: 191321218
Test: build pass
Change-Id: I9ae819f06b2b6f042c2f39a8ff76c025ba49f631
 2021-06-25 08:47:21 +00:00
Bonian Chen
4a6733e456 [Settings] Fix build breakage 
There's a missing file within ag/15076791.
ag/15102531 is a revert for ag/15076791.

Right now, ag/15106410 is a revert for revert (ag/15102531).
And this is a CL adding the missing file back.

Bug: 191321218
Test: build pass
Merged-In: I7282c7ba9fbb793056c12928843b6eef59eb2213
Change-Id: I15819472b37a3bdba25fe006246baa968680a19f
 2021-06-25 16:38:27 +08:00