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

91176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
62f574b502 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08 am: 96cb752b6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: I7a1fccdb9b5e61623fa4c59c068d9613e16f0095
 2021-07-01 17:49:43 +00:00
TreeHugger Robot
96cb752b6f Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: I0b542f1b56142d9331dadfacc749769ee6d5c542
 2021-07-01 17:49:33 +00:00
Yanting Yang
33834ab6a7 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: 8236794aa5 am: 5d5f002f19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I26f8cf4bdff4b1b2eb767cecf72d9c36e344b3f7
 2021-07-01 17:49:30 +00:00
TreeHugger Robot
fe4dac1cb8 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 am: de5043c516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: If484870dec81abe5b65346840a99e4b53848a2bc
 2021-07-01 17:48:33 +00:00
TreeHugger Robot
af63867d08 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev 2021-07-01 17:35:51 +00:00
Peter Wang
494c68e3cf Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" 
This reverts commit eba8857094.

Reason for revert: Issue not urgent enough to go in S, will resubmit to master

Bug: 185553806
Change-Id: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
 2021-07-01 17:35:43 +00:00
TreeHugger Robot
de5043c516 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: Idc31df33e3049dbdc1c76aee1ccfc40a9668ce58
 2021-07-01 17:28:17 +00:00
TreeHugger Robot
964404b2b7 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev 2021-07-01 17:17:01 +00:00
Yanting Yang
5d5f002f19 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: 8236794aa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I3e23528c4fdcc4fd85c5ebaada69cb250eab7a27
 2021-07-01 16:43:23 +00:00
Yanting Yang
29d6a13c58 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: afd19d5310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I158505cd98c0765162d17771e91d0926c67e2887
 2021-07-01 16:42:34 +00:00
Yanting Yang
afd19d5310 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I1f889aa1f72b79e23b7b7e7a2e954a055baa35d8
 2021-07-01 16:33:16 +00:00
Yanting Yang
8236794aa5 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I7e8efcf1f75541e303ca8ed57de4fb5eef3fba73
 2021-07-01 16:33:12 +00:00
Yanting Yang
fdc7659754 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev 2021-07-01 16:24:15 +00:00
Alex Johnston
0e898acd4a Add bottom padding to 'Choose a new lock screen' 
* Add 24dp padding

Before: https://screenshot.googleplex.com/64sTaMhwqMKQ4CE
After: https://screenshot.googleplex.com/As33LmkLXG7duV5

Bug: 192541032
Test: manual testing (see screenshots)
Change-Id: I4e29e4f776e7be1c42301c39c4844d7ee948eaaa
 2021-07-01 16:20:23 +01:00
Tom Hsu
f36d76558b [automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 am: 6ff7306d51 -s ours am: 6e24f125ca -s ours am: 68991eb7e1 -s ours 
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83 is already in history

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

Change-Id: I95169959e04f7beed7a7fffc57e873b3582ec75a
 2021-07-01 12:51:38 +00:00
Tom Hsu
68991eb7e1 [automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 am: 6ff7306d51 -s ours am: 6e24f125ca -s ours 
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83 is already in history

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

Change-Id: I625106b3de67c27d0bd11f22cc9f6c17f5e0af36
 2021-07-01 12:42:32 +00:00
Tom Hsu
6e24f125ca [automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 am: 6ff7306d51 -s ours 
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83 is already in history

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

Change-Id: I76853bce59f351cec5daa360da0a20fc9bd97e78
 2021-07-01 12:27:18 +00:00
Tom Hsu
6ff7306d51 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980

Change-Id: I317a0e09d0d43cdaa96baead76416d09b018a20a
 2021-07-01 12:12:33 +00:00
Tom Hsu
53f081be37 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." 2021-07-01 12:00:52 +00:00
Yanting Yang
ed7139fad0 Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning 
Since the screen title of the Location Services page is not the same
as the preference title on the Location page, it breaked the page
relation between Location and Location services to lead to the broken
breadcrumbs for Wi-Fi scanning and Bluetooth scanning.

Fixes: 192540579
Test: visual
Change-Id: I9fbc4033517a715e97e534991549a1029ca4e5fa
 2021-07-01 19:22:02 +08:00
TreeHugger Robot
1c9cfd0dd5 Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: e8a6ddc02b am: ced947e40a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: Iea9d74f08ba5267a5c49fb7946d4004c11ff4fa9
 2021-07-01 11:07:48 +00:00
Wesley Wang
963c75a689 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c am: 72ffa64746 am: ddc02bb7c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: I11b421af95d8209fc4cacc4568d3ffda79bc5d86
 2021-07-01 11:07:42 +00:00
TreeHugger Robot
b6b6adb28e Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: e2b32bceab am: f224fdee29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: Ibdc3b360e051a59351351d0f1a7d729d63eca2ec
 2021-07-01 11:07:35 +00:00
Wesley Wang
8519ad8f88 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c am: e71e0176f0 am: 8a60294b26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: I216ff5a78701fbac7a2cb7aff2e9b6aa6bf0759d
 2021-07-01 11:07:04 +00:00
TreeHugger Robot
ced947e40a Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: e8a6ddc02b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: I63e1b3e1c1685e72b0ced8891dfb321e1f717f5b
 2021-07-01 10:58:37 +00:00
Wesley Wang
ddc02bb7c4 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c am: 72ffa64746 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: Ic3b0175739873746113d8bb693506f1546b84ee4
 2021-07-01 10:58:28 +00:00
TreeHugger Robot
f224fdee29 Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: e2b32bceab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: Iee997b0a3943015e1a60d10757827e82c2728194
 2021-07-01 10:58:15 +00:00
Wesley Wang
8a60294b26 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c am: e71e0176f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: I9619130bdbdb250d51b51988af308ee4cbf42c2a
 2021-07-01 10:57:59 +00:00
TreeHugger Robot
6b424d264d Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: 8ea6f6382e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: I8c2c85944500d0a050516f923d41babaf709c479
 2021-07-01 10:57:36 +00:00
Wesley Wang
427a265713 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c am: 6fc0fcdf57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: Ib46317dc6ad809ce05ce378247ab008d38b8b99a
 2021-07-01 10:57:30 +00:00
TreeHugger Robot
e2b32bceab Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: Idd4de9fb3c9a7d9e97ed54e1fe35d3ce88779a2a
 2021-07-01 10:39:25 +00:00
Wesley Wang
e71e0176f0 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: If4b2d991ddd95391b987246e40a6b34a5cd5b958
 2021-07-01 10:39:16 +00:00
TreeHugger Robot
8ea6f6382e Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: I51f27def0f935eba855bf711aa961b1b4f8c33ae
 2021-07-01 10:38:41 +00:00
TreeHugger Robot
e8a6ddc02b Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: If658ebeb08b49494eea84a54d71cc72cf093dbdd
 2021-07-01 10:38:41 +00:00
Wesley Wang
6fc0fcdf57 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: I4bc7ddcbf5b397d4c07e64c80e23b0e792043d72
 2021-07-01 10:38:33 +00:00
Wesley Wang
72ffa64746 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: I625f8890a705d6ad0ba3afeca243607a150a1b17
 2021-07-01 10:38:29 +00:00
TreeHugger Robot
166d2e3609 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: 19997e4f18 am: 27d933ed22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: Ib346dfce7648721271e1c2e610ed4c6e4bd85944
 2021-07-01 10:28:39 +00:00
Automerger Merge Worker
7ac9a4e59c Merge "Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 59c5b1898f" into sc-v2-dev-plus-aosp am: d4005a11d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: Iff332afabd8ff04d7e2cd027c56062f2df43c225
 2021-07-01 10:28:17 +00:00
TreeHugger Robot
a0b10929b1 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: b58a2527b7 am: 08c4018153 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: Id0729232b7f0365f3c659f0e4f7efc9406ac2ab3
 2021-07-01 10:27:57 +00:00
Betty Chang
140a88baa6 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 4414631723 am: fa868058b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: Iaa332e9fd56f842a33bf631b889492b4abd9d50d
 2021-07-01 10:27:09 +00:00
Betty Chang
ac621ef76c Merge "Set the attribute of the dialog window for overlay QS internet panel" 2021-07-01 10:13:19 +00:00
TreeHugger Robot
150ed0b071 Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev 2021-07-01 10:09:08 +00:00
Wesley Wang
a6a4fe474c Merge "Update filter logic for BatteryDiffEntries" into sc-dev 2021-07-01 10:05:38 +00:00
TreeHugger Robot
27d933ed22 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: 19997e4f18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I711aa4aa7ca2c0f22fa5051623e3e39daa87c21d
 2021-07-01 09:52:35 +00:00
Automerger Merge Worker
d4005a11d0 Merge "Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 59c5b1898f" into sc-v2-dev-plus-aosp 2021-07-01 09:52:20 +00:00
Betty Chang
8f2de6f092 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 59c5b1898f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: I584300e62d0cf343373d5c16a89c80e93076ea71
 2021-07-01 09:52:16 +00:00
TreeHugger Robot
08c4018153 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: b58a2527b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I83863100def288efc12a0a1e575b0102e7349ff0
 2021-07-01 09:52:14 +00:00
Betty Chang
fa868058b2 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 4414631723 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: Ie343bba241d3e643fa1d346723f9b070c7b8a930
 2021-07-01 09:52:03 +00:00
TreeHugger Robot
017ff60a19 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: 1150684841 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I06ff6aa68c1a243f35710ae9f95530de0a2810d3
 2021-07-01 09:51:35 +00:00
Betty Chang
b0d197b002 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 8bf1d8bc1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: I4a162c7a407bb45841a2c32398ba3de4c7929b09
 2021-07-01 09:51:18 +00:00