PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,551 Commits 1 Branch 0 Tags
3c14bb21a36bf81b2df3409fa55d7bedba3ef39c
Commit Graph

89551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
288166cc79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0 -s ours am: c690bdb912 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e2e1951b87ec327b3c8a89351f955cee755e1ac
 2021-06-18 01:35:09 +00:00
TreeHugger Robot
c7e159134e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours am: 8180908fe4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c10831ee52d4e970b3d7513c12318d5236d946b
 2021-06-18 01:34:58 +00:00
TreeHugger Robot
cc1ee5c3e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours am: 3820dcdd6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d5e5422d165b47385d9eadeb74ce93115ae4522
 2021-06-18 01:34:36 +00:00
TreeHugger Robot
0e809b8b40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-18 01:25:06 +00:00
TreeHugger Robot
14ac44ac8f [automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848 -s ours am: 3319bbdd3d -s ours am: 7fad2b79b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fffc2357000b3501a1f5b85c6e72f56d03d6921
 2021-06-18 01:22:57 +00:00
TreeHugger Robot
69d0cef2ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c531a2ebbd17246d09489c7e3e89d4cabe4b837
 2021-06-18 01:19:55 +00:00
TreeHugger Robot
77e40459d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-18 01:19:50 +00:00
TreeHugger Robot
8180908fe4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73f0d13a61be33c110d1b757c8e5f1ea5952d31d
 2021-06-18 01:19:40 +00:00
TreeHugger Robot
37b855f44a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb4d0ed887b92329d03b7b2651f1936f22a69a26
 2021-06-18 01:19:24 +00:00
TreeHugger Robot
c690bdb912 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3f637814c44c98d682b4364831d5e6c01d6b665
 2021-06-18 01:19:07 +00:00
TreeHugger Robot
8210206504 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08bcfc57ea0a12a9b1f93cfd3ebdc450108cfcfb
 2021-06-18 01:18:56 +00:00
TreeHugger Robot
3820dcdd6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1df194c74c60db01f65beecf9964395152f91fe9
 2021-06-18 01:18:49 +00:00
TreeHugger Robot
a7703602b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-18 01:07:32 +00:00
TreeHugger Robot
a23758349e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-18 01:06:12 +00:00
TreeHugger Robot
7fad2b79b2 [automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848 -s ours am: 3319bbdd3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2651afe3d3db826c1b46982ff017f32db2087d68
 2021-06-18 00:57:11 +00:00
TreeHugger Robot
3319bbdd3d [automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848 -s ours 
am skip reason: Merged-In I1cc3796f31e7db3d8f062436ebc618d93db19822 with SHA-1 38d3b0fa18 is already in history

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

Change-Id: Ida0de335047c2cebe9f86810c9fdd529738fdc41
 2021-06-18 00:51:54 +00:00
TreeHugger Robot
d9e78dc848 Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master 2021-06-18 00:31:00 +00:00
Bill Yi
08386bd061 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f25f1144169f8b43cd6154d9e63a56f1a00823e
 2021-06-17 23:57:02 +00:00
Bill Yi
1809285e19 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieae8de32be4db5d051cab939e23327b3f533cb8f
 2021-06-17 23:53:26 +00:00
Peter Wang
95028d129c Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 70fec74fe6 am: 1286161dff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: Ie12781cb0468fa709dc32f098c5ae952bd828797
 2021-06-17 23:04:04 +00:00
Peter Wang
101a4162bb Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 4a17c2ce85 am: c0b5a210ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: I562a3a0c7ddbb25c2ed45f82a642122cdd43c4a3
 2021-06-17 23:03:33 +00:00
Peter Wang
1286161dff Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 70fec74fe6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: I8009fa916422e825b0e96b11ba5edb5ea7894e57
 2021-06-17 22:47:46 +00:00
Peter Wang
c0b5a210ab Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 4a17c2ce85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: Ic5bc3e0e75a09683a9506a349d8a23299bfc150a
 2021-06-17 22:47:27 +00:00
Peter Wang
b9bb8254e7 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 307c47eb16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: If43af6f6d3005214a800daa2b446c4900a35b089
 2021-06-17 22:46:58 +00:00
Peter Wang
4a17c2ce85 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: Iafb5583a51966b5620cdf383885765cdeb0d8284
 2021-06-17 22:28:10 +00:00
Peter Wang
307c47eb16 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: Iff4a24436e5ffa001f0ece1b85e90be55eb6ceab
 2021-06-17 22:27:19 +00:00
Peter Wang
70fec74fe6 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: Id08d349c376211cb3530009945c58cdcd31b0f46
 2021-06-17 22:27:19 +00:00
Peter Wang
2c5788b533 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev 2021-06-17 22:14:50 +00:00
Bill Yi
d2b3465c91 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie592748281a9b71c92a89a4051249a1e1960d21f
 2021-06-17 15:07:01 -07:00
Bill Yi
5cc770aba5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I63596bc5b219e1992b38afcb6ebdfdf5e28d3ae0
 2021-06-17 15:03:16 -07:00
Xin Li
7d73dec24c DO NOT MERGE - Merge ab/7272582 
Bug: 190855093
Merged-In: I1cc3796f31e7db3d8f062436ebc618d93db19822
Change-Id: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
 2021-06-17 21:56:04 +00:00
Joe Bolinger
4af5a3644d Update strings for parental consent flow in setup wizard. 
Bug: 188847063
Test: manual
Change-Id: I044be874818f6563a47c3f7c8c5011b3cab31ae9
 2021-06-17 14:53:56 -07:00
Julia Reynolds
fbf3681c65 Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff am: bfe49de437 am: 5594957e87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: Ice7720316da1aaed61a51472aa3b2b6d4eb02f8c
 2021-06-17 20:23:29 +00:00
Julia Reynolds
ccb1817b8d Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff am: a0a0e5b03e am: 44ea03fa73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: I14a1ef9c3f669ddab4dc3e3ed59d9b1348131edb
 2021-06-17 20:20:39 +00:00
Julia Reynolds
5594957e87 Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff am: bfe49de437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: I8f7ee2568f5e29ef061581df85b61f2aae16aaf2
 2021-06-17 20:03:11 +00:00
Julia Reynolds
13dce6aec6 Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff am: 495245e692 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: Idb7d142f1e8ac66421c18b910bbe5e8df2ad8ec9
 2021-06-17 20:01:40 +00:00
Julia Reynolds
44ea03fa73 Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff am: a0a0e5b03e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: If310efb07bd17286594f88c9f24d308013c205eb
 2021-06-17 19:55:13 +00:00
Julia Reynolds
495245e692 Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: I54dc9d7abf5836a19778a60c8ef2cfbf530a9b4e
 2021-06-17 19:43:00 +00:00
Julia Reynolds
a0a0e5b03e Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: I34b8acd8c8bc517965df1de1554a24341a1629a0
 2021-06-17 19:42:14 +00:00
Julia Reynolds
bfe49de437 Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: Id0f8925693cf961f46d41bc7d8cbb25fccae82b8
 2021-06-17 19:42:05 +00:00
Julia Reynolds
fb359d18ff Merge "Validate config activities with their rule owners" into sc-dev 2021-06-17 19:34:43 +00:00
Julia Reynolds
d4825cbdd7 Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 am: 35e339f6e3 am: b6e93635e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: I492501c1c9fc136638e78980a955acba4e5f7990
 2021-06-17 16:49:12 +00:00
Julia Reynolds
7254c039f8 Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 am: fe0d3ab0cb am: a7cb6de357 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: I7f3f87e8d0b048001e20e9111ac840bc1e6825f5
 2021-06-17 16:48:42 +00:00
Julia Reynolds
b6e93635e0 Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 am: 35e339f6e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: Idc932337c214df51317793675a5373209fcd93b0
 2021-06-17 16:36:54 +00:00
Julia Reynolds
a7cb6de357 Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 am: fe0d3ab0cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: I987d9b6930c18dd147c87eb46b6a3e4ca4e9730b
 2021-06-17 16:36:27 +00:00
Julia Reynolds
472f80cfd9 Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 am: bd8cdf25af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: Idb581ab4966ad2fa3f141f0150f4b9bf5c8dec63
 2021-06-17 16:36:11 +00:00
Julia Reynolds
fe0d3ab0cb Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: I87fa0b5fbdeaf408f0639936d8a142e7131b9494
 2021-06-17 16:22:15 +00:00
Sally Yuen
77d36edd11 Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9 am: 9281ab108a am: 3d3d682625 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

Change-Id: Iefc130e8f7599e92adff4b5177fdef4e12d0341f
 2021-06-17 16:21:34 +00:00
Julia Reynolds
bd8cdf25af Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: I838ff3a20e5a21ec1098dffff986715966176e8e
 2021-06-17 16:21:26 +00:00
Sally Yuen
fe64b27423 Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9 am: 9cb975e4c4 am: 348a15d269 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

Change-Id: I31e225c0154a57426c4477960057fefd19bf449f
 2021-06-17 16:21:26 +00:00