PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,420 Commits 1 Branch 0 Tags
f93f6704cbf08a23c974e16809aa684f4d71b356
Commit Graph

93420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f93f6704cb Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 2p: 15ab7d0c6c
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:50:16 +00:00
TreeHugger Robot
580e257e70 Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-mainline-prod am: 0c9c334b1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913

Change-Id: Ib28749eb844c298868af9acecd7e935dcbd08c03
 2021-08-13 18:50:05 +00:00
TreeHugger Robot
3167dcf27c Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-mainline-prod am: 8fc6977e1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901

Change-Id: I4791b12b054bacaab31b133879e8e23c96be6f22
 2021-08-13 18:49:54 +00:00
TreeHugger Robot
bacdfa0ca1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: dbb7ff17bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8a3038ce8f6445b62cf2c1b243872f80846d16d
 2021-08-13 18:49:04 +00:00
TreeHugger Robot
19f9ff8508 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: b56e57822e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b84bf33f8866c15b2c62f1d935687dba195e888
 2021-08-13 18:48:13 +00:00
TreeHugger Robot
0c9c334b1c Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:45:05 +00:00
TreeHugger Robot
a5f6998f93 Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c 2p: 9dba803711
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:45:05 +00:00
Bill Yi
1f7e29e922 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 325b0477ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia717ace4a44a1e8e77d676501620cd10a9a101fa
 2021-08-13 18:43:55 +00:00
TreeHugger Robot
8fc6977e1c Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:39:35 +00:00
TreeHugger Robot
df2b163ad3 Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 2p: 73ef004527
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:39:35 +00:00
TreeHugger Robot
dbb7ff17bb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-13 18:31:09 +00:00
TreeHugger Robot
8149a12b1a Merge changes from topic "presubmit-am-7d547a7b5cc74320bbbf62dfd4e87346" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 289ff0bec9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:31:09 +00:00
TreeHugger Robot
b56e57822e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If914be129437f95b93643e6a99d8cc2b85338ae5
 2021-08-13 18:21:42 +00:00
Bill Yi
325b0477ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id85c17d8f0f7dbd160a24ab8d9e08b9a8e617a33
 2021-08-13 18:21:27 +00:00
TreeHugger Robot
cdc3f31562 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-13 18:15:24 +00:00
TreeHugger Robot
ede03fcc17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
 2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
 2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 17:59:41 +00:00
TreeHugger Robot
c304ced072 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-13 17:38:56 +00:00
Joshua Lewis
385d36ac2d Merge "Parse AM Constants to get keys:value for Dialog" 2021-08-13 16:46:31 +00:00
Ayush Sharma
8851afb8ff Merge "Remove refs of isSeparateProfileChallengeAllowed" 2021-08-13 15:49:11 +00:00
TreeHugger Robot
10cde2f003 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: f1772f686b am: 58dcefef22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Ib04c854d51e2c2ca0c625d98a092fef7b1b55603
 2021-08-13 15:36:30 +00:00
TreeHugger Robot
58dcefef22 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: f1772f686b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Iba1b42b2e38903fcff5be73b894d047a94d9bdf2
 2021-08-13 15:21:14 +00:00
Joe Bolinger
c214192c42 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 725619f6a0 am: 86aebc1ea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: Ia3fb6c524f02c9305076df5c7365d8666698cb78
 2021-08-13 11:55:16 +00:00
Joe Bolinger
86aebc1ea3 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 725619f6a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I01a99168f28500597ec4f43175b3f91355c6fac0
 2021-08-13 11:41:44 +00:00
TreeHugger Robot
03a9dfe57f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9 am: fb60c7664f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: If8185fd1c7cfca44264e3339b87b3cae3fd574e1
 2021-08-13 05:53:35 +00:00
TreeHugger Robot
fb60c7664f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I5c096d2b447c8012dc7b7cd27598585651123e60
 2021-08-13 05:38:45 +00:00
TreeHugger Robot
f1772f686b Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Id581e29e3b2ec42a93846d1878caf9bee334fa3b
 2021-08-13 04:27:15 +00:00
TreeHugger Robot
597ca951a9 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a
 2021-08-13 04:27:14 +00:00
Joe Bolinger
7cb30578d9 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 3872ed4b8c am: d703385e2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: Ic2156386adf84e971601115773ad1852345c4562
 2021-08-13 04:12:19 +00:00
Kevin Chyn
cbbe608f2a Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8 am: bf8ad9f293 am: e8b0c5e93c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: Iab36d63e5aeb9c14e21158631b8eb60a9a4f76ea
 2021-08-13 04:12:06 +00:00
TreeHugger Robot
1741d5d12c Merge "Handle spanned conversation labels" into sc-qpr1-dev 2021-08-13 04:11:04 +00:00
Joe Bolinger
d703385e2a Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 3872ed4b8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I43dd97bbb63d018fbefb187998e6a59c7000cbd5
 2021-08-13 03:56:35 +00:00
Kevin Chyn
e8b0c5e93c Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8 am: bf8ad9f293 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I6a81869653a56c3e0830865e1581662ba53a36f1
 2021-08-13 03:56:27 +00:00
Bill Yi
bed5e19e8c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 2p: 15ab7d0c6c 
Blank merge reason: parent was merged -s ours

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

Change-Id: I767e0473717036cdfc6289d1c53d9a2a84d1fa4f
 2021-08-13 03:49:13 +00:00
Bill Yi
15ab7d0c6c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic389c7c140da5623b3ace0ee55848a2d155144a1
 2021-08-13 03:49:10 +00:00
Bill Yi
d486302dc9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
 2021-08-13 03:48:58 +00:00
Bill Yi
36fff1be30 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c 2p: 9dba803711 
Blank merge reason: parent was merged -s ours

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

Change-Id: I90eb1c17f7ca2e3e3db111fa9325f686318d9063
 2021-08-13 03:42:44 +00:00
Bill Yi
9dba803711 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id2e759302f5447f9c2996cff8c409139e6ec8bcc
 2021-08-13 03:42:40 +00:00
Bill Yi
f30152962c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
 2021-08-13 03:42:27 +00:00
Bill Yi
4cba8eeaa3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a31fd17c58c7c0c7da73c7aa36715861db381d5
 2021-08-13 03:38:26 +00:00
TreeHugger Robot
82e113be62 Merge "Don't show Wi-Fi icon if the level is -1" 2021-08-13 03:35:58 +00:00
Bill Yi
8fa8a9eafe [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 2p: 73ef004527 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ic8b1c780adb39c4c880108c43ed31e3ed59a041a
 2021-08-13 03:33:08 +00:00
Bill Yi
73ef004527 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 
Blank merge reason: commit message contains skip directive

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

Change-Id: I58e1a552c8d3e9dda7f10635c2bb436aa6f33740
 2021-08-13 03:33:05 +00:00
Bill Yi
d9ba125bb8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
 2021-08-13 03:32:57 +00:00
Bill Yi
ff33565826 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1d716ccccc180e419f2fdc89cf1a500a91ebdcb
 2021-08-13 03:31:19 +00:00
Bill Yi
dff93bb6b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
 2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
 2021-08-13 03:24:52 +00:00
Joe Bolinger
2b455f7fb2 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 74efeebf5c am: 0c8e25d2f6 am: ba21ddcc35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I55f27196fbc17b17d665a75788d9d5b6c1952a53
 2021-08-13 03:11:35 +00:00
Kevin Chyn
90640a786d Do not show work profile strings for parent-managed enrollment am: 570540b15c am: a92e3d9a03 am: 9e7a7cc40e am: 6b6d641f21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I63ab8420a871cacb38abcac10c08aa3b50dcd003
 2021-08-13 03:11:04 +00:00