PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,176 Commits 1 Branch 0 Tags
f635191bf3d9a1f63af321f13cb92c5c138b51a7
Commit Graph

109176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f635191bf3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: 01a2a417e0 -s ours am: 8d02a428d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If95d7aca351dfd49b862d418d20b7b9f60f3b0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:35:15 +00:00
Automerger Merge Worker
4afa520916 Merge changes from topic "am-c1773d780890403592114bbff254b56b" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbae89efd6 -s ours am: 42ca15e814 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817a494d0e -s ours am: d07051c249 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6bce5228 -s ours am: e60de10f9d -s ours
 2022-09-04 21:34:55 +00:00
TreeHugger Robot
8a1836a931 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbae89efd6 -s ours am: 42ca15e814 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9736d34a6f66b7657e559cffdfea8238316db7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:34:48 +00:00
Bill Yi
d98d788d96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817a494d0e -s ours am: d07051c249 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5138499c8489bd6a3c0e9c73b9a12a576c2d4ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:34:38 +00:00
TreeHugger Robot
7a7644a4f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours am: 7cfbf2e0d3 -s ours am: ef25d97c1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7aebb6d316caf0af1c78756f2f64c090ad902bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:34:22 +00:00
Bill Yi
c58d0d55c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6bce5228 -s ours am: e60de10f9d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4808da5b61ef71e5a0147918f550a66dd6917a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:34:19 +00:00
Bill Yi
186f6fd23c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours am: 810c7b6e7a -s ours am: ffa1118b35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23362132995d6cd6a80e82b0936860da3459e81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:34:07 +00:00
Bill Yi
ecd9c12048 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: 01a2a417e0 -s ours am: 742cf7d2dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id159968b4eccd1540af9536586f2598ffc458077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:33:55 +00:00
TreeHugger Robot
095d341c86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbae89efd6 -s ours am: bf04811a50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4da54ac5300bc0323d7e50e966d7de1cfa8bf717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:33:12 +00:00
Bill Yi
5d474ac7e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817a494d0e -s ours am: 6127c1b003 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If580cf66db8b728ea921fa71306079a6d859d205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:32:57 +00:00
Bill Yi
47a5953cd1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6bce5228 -s ours am: 82a5f45adc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bedb09d9bcb61c7c2041b9f17c93dfd0b71137f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:32:45 +00:00
TreeHugger Robot
ef25d97c1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours am: 7cfbf2e0d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb34095c5638f02d0ed510201bd09114ef736b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:09:06 +00:00
Bill Yi
8d02a428d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: 01a2a417e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea15ba9c400ca9d69ff83465eb86bdac45f04b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:55 +00:00
Bill Yi
ffa1118b35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours am: 810c7b6e7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e18685e3793c45f4dc7ab4210ee11d8d7b1e116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:52 +00:00
Bill Yi
742cf7d2dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: 01a2a417e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If330ebc6c1efc7ebd0ad39604e327147a6279cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:40 +00:00
TreeHugger Robot
7cfbf2e0d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7b45a9b0171e9ec92cd776c3364c642f54f70d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:03 +00:00
TreeHugger Robot
42ca15e814 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbae89efd6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If20cc4735621981bf0f1de270be423213e1d6fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:02 +00:00
TreeHugger Robot
bf04811a50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbae89efd6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27e2916909e412900c6fd6e27e8f27635602c451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:59 +00:00
Bill Yi
810c7b6e7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51da3ed71a0456683db4a027a05f85ae262c13a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:48 +00:00
Bill Yi
d07051c249 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817a494d0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I568a2e42705cbca24b77e1baa84eb6dcbd8d023c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:47 +00:00
Bill Yi
6127c1b003 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817a494d0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9ae02517c641af755178f7b058f551f1a839dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:44 +00:00
Bill Yi
01a2a417e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a9aaf6ac00fa7c5ad8ce954519d9cfec5222e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:35 +00:00
Bill Yi
e60de10f9d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6bce5228 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I454239ed09fdfc39144b278d2090c9e53c583743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:34 +00:00
Bill Yi
82a5f45adc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6bce5228 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4963d15a61b5c403771a1c2ed92d4606733312db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:30 +00:00
TreeHugger Robot
98f921cf42 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-09-04 20:35:48 +00:00
TreeHugger Robot
cbae89efd6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-09-04 20:32:46 +00:00
Bill Yi
817a494d0e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibbc683ac8ab3e7c2489079c22fceb8ef6dd7add7
 2022-09-03 19:59:47 -07:00
Bill Yi
c798596fd5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If62421d8025fe9fc59a8805da0a21d889e56323e
 2022-09-03 19:51:44 -07:00
Bill Yi
ac6bce5228 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6127e150c61694b772d6c8a4b9fdb745ca2907bb
 2022-09-03 19:47:59 -07:00
Bill Yi
de9688841c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ice6605bdce55661c00d1190f954dc90461b9874b
 2022-09-03 19:44:44 -07:00
TreeHugger Robot
8f0b3c2d6a Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev am: 048bc692a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19774526

Change-Id: I0d86d362802950e46346718a02dc150fbfb59eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 21:05:43 +00:00
TreeHugger Robot
048bc692a4 Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev 2022-09-02 20:09:01 +00:00
YK Hung
06e92f5e45 Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6c4d4d551dc4ccd1897422cd65bf26cadeb9994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 15:46:17 +00:00
YK Hung
8bf872331b Merge "Update defend tips card" into tm-qpr-dev 2022-09-02 15:18:50 +00:00
Treehugger Robot
b151b094cc Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487 am: f8701c71e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: I23cc61383530de734ef9f3e8141078757a45ec22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 05:46:17 +00:00
Treehugger Robot
f8701c71e6 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: Ie5e1fdec16f3c5dfcee1b7a8dccc400a4f6a781c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 05:01:47 +00:00
Treehugger Robot
02a5b5e487 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: I59984a70a4a691ba4967238ec2eb5b2dbaf0ff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 04:34:07 +00:00
Treehugger Robot
3799ecc58a Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: I5a77b5153c4357f09e6f5d10dce9f7f31b3d1d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 03:59:57 +00:00
Treehugger Robot
36a80cd8e6 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" 2022-09-02 03:36:40 +00:00
Joe Bolinger
078f2c7d94 Merge "Add product variants for unicorn strings." into tm-qpr-dev am: f9e992f490 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19775632

Change-Id: I1eb23bbad270e8f44a234d05e490c0b81757f268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 20:10:54 +00:00
Tetiana Meronyk
8b7a6d5349 Merge "Update icons in multiuser settings" into tm-qpr-dev am: a666d80973 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745315

Change-Id: Id3e70245326590a9c7948fbbbd9da2bfab866d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 20:08:17 +00:00
Joe Bolinger
f9e992f490 Merge "Add product variants for unicorn strings." into tm-qpr-dev 2022-09-01 19:14:35 +00:00
Joshua McCloskey
c76f988475 Updated fingerprint dialog deletion strings. 
Test: Manual
Fixes: 234183857
Change-Id: Ieb500d52f705eb269937cd0fcd6b14081f9662ee
 2022-09-01 17:27:51 +00:00
Tetiana Meronyk
a666d80973 Merge "Update icons in multiuser settings" into tm-qpr-dev 2022-09-01 16:55:29 +00:00
SongFerng Wang
954b9bafd0 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f am: ea2cff12f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: I83c762cdff99730bfcda9775beb69c41c70f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 13:32:14 +00:00
SongFerng Wang
ea2cff12f8 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ibe979b946fcc259208c710311e2ae7b7bce2a2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 13:06:57 +00:00
SongFerng Wang
545db0361f Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ibeb10dbb48e3b2332f9056674a0a237ff28d5f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 12:37:38 +00:00
SongFerng Wang
55f71f5496 Merge "Add owner for job handover" am: 89418428f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ic94463eedc59971e8c5c162f2dfdad203c917508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 11:37:56 +00:00
SongFerng Wang
89418428f6 Merge "Add owner for job handover" 2022-09-01 10:58:19 +00:00
TreeHugger Robot
14fb5d73e1 Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev am: d2074b38f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19800638

Change-Id: Idfed8a2a0baf80149469079dfc5ada14fa9e37d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 09:56:56 +00:00