PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,044 Commits 1 Branch 0 Tags
bef504f4d900bdada5a93b6502bf4d1505deeda4
Commit Graph

105044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Mccloskey
6f430f8e66 Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I61bb8dcd5fb07d4493bfe6f140008e2567e923cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:37:36 +00:00
Joshua Mccloskey
02f0255b7a Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I2424dc5d7377fd8f86f6d7d6c0dc14dfc274425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:29:29 +00:00
Joshua Mccloskey
9f1af4fc86 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135

Change-Id: Idb03b051753fa418e8ffb40d6f2fbc1a7d7db287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:29:07 +00:00
Joshua Mccloskey
06b76edbb7 Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I024b04ef4f87b923ff48d09fcf88036f7b51b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:27:59 +00:00
Joshua Mccloskey
52450aaa17 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev 2022-06-10 16:06:17 +00:00
Joshua Mccloskey
75313dcb5d Merge "Updated FP enroll confirmation string" into tm-dev 2022-06-10 16:05:31 +00:00
TreeHugger Robot
579cdfb0a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: 999a23bee0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I322bfe17e2523248e6ed8b06bcba7aad7969c653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:06:45 +00:00
Bill Yi
ca3537a81e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours am: 16761c0f92 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e8a5a18aa22dd34b003f94d3bf3d88a2ec9792a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:06:40 +00:00
TreeHugger Robot
772ae4174e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours am: 3b34105f01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5db3c180784c87c4f00d7e7953fa81641196e3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:06:30 +00:00
Bill Yi
26d9456296 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours am: b807236c50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27493619de76ff5485c6cc4bb5df96268987cc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:06:17 +00:00
TreeHugger Robot
3bf9830e4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: ee896b46e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76ebc79be223327660477cdad86d556bef0b5e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:03:50 +00:00
Bill Yi
2ed856f004 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours am: 6a5ff2d6a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I864b6a2fd0ff2a3f9d46e44644f14c3d711ac3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:03:45 +00:00
TreeHugger Robot
706ca35aa8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours am: 1175da33ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I692572d6588be7cdf8c91cd7210487f011b60bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:03:35 +00:00
Bill Yi
f9494d6c97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours am: 5c0212eab6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcaca129cc3e85e3b392e136b4b0bce191d8d55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:03:22 +00:00
Bill Yi
b76ebc730e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec2ab26807b75912f0e78599b41aa5b4b73a71cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:00:14 +00:00
Bill Yi
59fa253f8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e0bca83173ef8964c9941cc96918ede3a77b1c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:59:59 +00:00
Bill Yi
6b1fcc6bd5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I527f49613e557b6a664f75ddf5886ad1df33745e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:59:44 +00:00
Bill Yi
be7ddbcb78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3eb84c3efa8f4539d98987431e0c306d142021d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:59:27 +00:00
TreeHugger Robot
ee896b46e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc79c0d0332a7e49d293cd5d7d1f34576ee3cd70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:51:21 +00:00
Bill Yi
6a5ff2d6a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I334022cc242a2dfa826e048ddf4b154f4a537a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:51:17 +00:00
TreeHugger Robot
1175da33ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I560d16ec38f46389b7a65e836fafd2b03011243d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:51:05 +00:00
Bill Yi
5c0212eab6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I901dc6475b628c6da28b36dbedece5bccc440b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:50:53 +00:00
TreeHugger Robot
999a23bee0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72c0d984507caddaea744779fd36cdeec11d92ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:58 +00:00
Bill Yi
16761c0f92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie47db7c1f3332d27502c71ea88633a7a21be250c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:54 +00:00
TreeHugger Robot
3b34105f01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00a778116f323c1132677cd846c99f447905e47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:45 +00:00
Bill Yi
b807236c50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8b6084476147b2d25f7174d8520cf1cf058b662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:31 +00:00
Bill Yi
21559f3793 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-10 06:17:14 +00:00
Bill Yi
a5648098e2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-10 06:17:14 +00:00
TreeHugger Robot
2b662c5a07 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
TreeHugger Robot
71826af4fb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
Automerger Merge Worker
64e9a40d9c Merge "Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82" into tm-d1-dev-plus-aosp 2022-06-10 02:51:16 +00:00
Jason Chiu
f26f49a789 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 6780e6ffdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Ie8d2fc2fd39a72e6057d1cab6919dbd8c93a91e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:51:13 +00:00
Jason Chiu
9c7cf01266 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: I798dca9946185ab979f31c633f0240ccc722a4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:51:13 +00:00
Jason Chiu
4ec1953a82 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Idf47ad68dd184cf45ce467eeb6be12a30e8c3057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:34:59 +00:00
Jason Chiu
6780e6ffdd Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Ied9c640a9a3586efa78eb1456234cbfac44904fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:33:22 +00:00
Bill Yi
c1ebda67c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
 2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
 2022-06-09 09:45:40 -07:00
Bill Yi
307f491327 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c5638e6e3c3eef94aad83f3799058fe9043e77b
 2022-06-09 07:35:45 -07:00
Bill Yi
d142ec9f58 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45c392de92cbb27ed670cb70b657074d0ac762e1
 2022-06-09 07:31:39 -07:00
Gil Cukierman
55e8d38038 Improve documentation of Enable2gPreferenceController 
Test: javadoc changes only
Fix: 235251754
Change-Id: Ieee483fdbeac3e581085c1a776974f82090743bc
 2022-06-09 13:47:45 +00:00
Alan Huang
b9be27b006 [VolumePanel] Fix the Hearable control slice uri parameter 
The provided uri doesn't contain the formatted string, so just append
the width at the end

Bug: 229048602
Test: make -j64 RunSettingsRoboTests
Change-Id: Idadbb4d725c8ca65bac31fbead8ac1d429ebcea9
 2022-06-09 08:22:33 +00:00
Piotr Wilczyński
ccb82954c4 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I5e7743cbeb5f6a39f2e2251eb52051a9f00dfcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 08:19:47 +00:00
Piotr Wilczyński
7018bd6f69 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 395861f79d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: Iba1f3f42b53b58216d66747b9ccb614b9cdefd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 08:19:39 +00:00
Jason Chiu
7f1ff1b796 Revert "Do not show the redundant RemoveAccountFailureDialog" 
This reverts commit e5f1d24913.

Reason for revert: "Remove account" does nothing and shows no errors
Fix: 232819214

Change-Id: I4a4e5084cde87ea2a9e5be1ff3ca6709e11ebc3d
 2022-06-09 08:14:13 +00:00
Piotr Wilczyński
8bfab753c1 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I00e339ffd5b02bcbfeccb512eeeedf6d6356df76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 07:59:40 +00:00
Piotr Wilczyński
395861f79d Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: Ib7e8232d1f4dafa6418363e629ba228d1eb217e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 07:58:03 +00:00
Piotr Wilczyński
7d634de3ea Merge "Notify about brightness change when screen turns on" into tm-dev 2022-06-09 07:39:07 +00:00
Automerger Merge Worker
51b13dd95b Merge changes from topic "am-48b99c33710f4307b5bcefa2db7cb9a2" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: 7d9636054e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: 1ad8ccd199 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 72a681dbe4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: a658060c06 -s ours
 2022-06-09 03:46:28 +00:00
TreeHugger Robot
871b4f2c44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: 7d9636054e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7be21f13dd053d66b617ab61860c3d28cf317cfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 03:46:05 +00:00
Bill Yi
ff4e49a788 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: 1ad8ccd199 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95648562922caecc934bd6e5c02f7039568493a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 03:46:00 +00:00