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

84439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
db0301401a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours am: 8210206504 -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: Ieab624bef71be48b50d2ab898894f8cc47351380
 2021-06-18 01:35:22 +00:00
TreeHugger Robot
ae96d77bde [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0 -s ours am: 69d0cef2ab -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: I0ce0bb227a13ebd53991eb393023a1eef7fd48e1
 2021-06-18 01:35:11 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Julia Reynolds
35e339f6e3 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: I15a1e3ca1492a82605db85d030548ed64865ab34
 2021-06-17 16:21:23 +00:00
Sally Yuen
3d3d682625 Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9 am: 9281ab108a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

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

Change-Id: Idbca001ba3925b318615224cdba362f55c9dba57
 2021-06-17 16:06:46 +00:00
Julia Reynolds
848f7a8796 Merge "Add a11y text for disappearing preference" into sc-dev 2021-06-17 16:03:25 +00:00
Sally Yuen
9cb975e4c4 Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

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

Change-Id: I94773c1e42aedeaad78cd8b539cdccb43591e336
 2021-06-17 15:51:41 +00:00
Sally Yuen
afd77763b9 Merge "Add labels to intensity slider and flip labels" into sc-dev 2021-06-17 15:37:32 +00:00
Julia Reynolds
0d937afbb8 Add a11y text for disappearing preference 
Test: Talkback
Fixes: 182241259
Change-Id: I99c1ce635c5717e22ee28bc86b51bd3be4b83d91
 2021-06-17 14:28:35 +00:00
Jason Chang
afff67ebc4 Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev am: 55d7d938bb am: f920a39c43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001651

Change-Id: I579c8dc562ccc9b8357f914f77fcccd28ac72452
 2021-06-17 13:29:12 +00:00
Jason Chang
c1c33bdd5d Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev am: 55d7d938bb am: 056e930c37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001651

Change-Id: I178f54b756d0b906304e7d5b228f9844f3dc9b8b
 2021-06-17 13:28:49 +00:00
Jason Chang
056e930c37 Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev am: 55d7d938bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001651

Change-Id: I7c972f2242b5b16fa4892efce02b1aae0adcecf1
 2021-06-17 13:19:30 +00:00
Jason Chang
f920a39c43 Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev am: 55d7d938bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001651

Change-Id: Ica8c8aacb4dd5124d7e19338814a30fc70d08294
 2021-06-17 13:18:28 +00:00
Jason Chang
55d7d938bb Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev 2021-06-17 13:00:52 +00:00
Tsung-Mao Fang
c9ffe47342 Collapse app bar while doing search in app page 
Prior to this cl, user can see a large space on app bar
while user is doing search on app bar.

In this cl, we enforce to collapse the tool bar in
search case, and we don't allow user can scroll app bar as well.

Fix: 187016306
Test: Play around the search behavior in app page.
Change-Id: I25ba3ef24949cc43989fec4a80f75a24a8d92c07
 2021-06-17 20:10:33 +08:00
Tom Hsu
85147d949b Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43 am: 6627a79a69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: I63d1276c61ed9831bdc525f86f6021aa36f75e0c
 2021-06-17 11:35:25 +00:00
Tom Hsu
1955bbed28 Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43 am: d332493def 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: I2f111cc95560ebf54459bec4c601e699a70c427d
 2021-06-17 11:34:45 +00:00
Tom Hsu
d332493def Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: If5720ff1bd460f7a311a5c87d0366282a51cf8fc
 2021-06-17 11:33:21 +00:00
Tsung-Mao Fang
232b3ac12a Disable the scrollable ability on app bar area 
As title, we do not allow user can scroll app bar while
the search menu is expanding.
So, we can ignore all drag events on app bar.

Test: Can not scroll on the app bar area
Fix: 181741353
Change-Id: I20c0b69059cdc4d13a15abd810a725d4591f6396
 2021-06-17 19:29:25 +08:00
Tom Hsu
6627a79a69 Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: Ibbc6055e51e67b590df4cffb0f9d2f17a62e1748
 2021-06-17 11:25:40 +00:00
Tom Hsu
0279a99e43 Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev 2021-06-17 11:23:12 +00:00
TreeHugger Robot
a1ff011ded Merge "Fix dialog color problem in night mode." into sc-dev am: f026108de5 am: b001f45b3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008367

Change-Id: I4cbf11b28c96def10ae3b9f0eb6f4a572d1bec29
 2021-06-17 11:22:06 +00:00