PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,543 Commits 1 Branch 0 Tags
b81eb46545f3e963c989c4610ba02a8e871b5cd7
Commit Graph

67543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b81eb46545 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: 081fc9279b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccebed366b0bd3e08c1e3f8886a1a8bee953c1d9
 2020-10-30 16:11:37 +00:00
Bill Yi
0ac3724dfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d1e8e10ff6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e9ac96bad9db5b20928e5c0f0eec22843f56742
 2020-10-30 16:11:32 +00:00
TreeHugger Robot
081fc9279b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib550c2733e1d19991b584193f697ddd1ed0e9398
 2020-10-30 15:59:13 +00:00
Bill Yi
d1e8e10ff6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3cc31af80be4d8713b8cd88601527358c1157877
 2020-10-30 15:59:03 +00:00
TreeHugger Robot
025633bdd4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-10-30 15:34:51 +00:00
Bill Yi
ad1862fff5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e893944fdf186bf1cfa3a66dd77a047e05a86a6
 2020-10-30 05:15:25 +00:00
Bill Yi
a32714b730 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18f71142db1259e005eb0b51ca44bdb4e69e5821
 2020-10-30 04:38:31 +00:00
Sarah Chin
d84135e91d Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf am: 94cabf8a02 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638

Change-Id: I2026849d4e4b4d057ea1f1d399994faedf913e1c
 2020-10-30 03:35:16 +00:00
Sarah Chin
94cabf8a02 Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638

Change-Id: I851c0994ed2aa79148b2b22d1733256c845a50a9
 2020-10-30 03:24:46 +00:00
Sarah Chin
07f2c27cbf Merge "Hide 'View plan' button in data usage settings" 2020-10-30 02:48:14 +00:00
Sarah Chin
d6e4e9d8fe Hide 'View plan' button in data usage settings 
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.

Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
Merged-In: Ieda020bfa692e9465d6297e50cf338deff91a8a9
 2020-10-29 16:36:28 -07:00
George Chang
520d9af539 Merge "Support RTL mode in payment option" am: 7e65d7f6fc am: ef4f13c936 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376

Change-Id: I7966cfb6f7e139575acdc0b3eb7c6166935175c4
 2020-10-28 13:32:21 +00:00
George Chang
ef4f13c936 Merge "Support RTL mode in payment option" am: 7e65d7f6fc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376

Change-Id: Ibfb1960e19f913cff8f879beb3da011d60108aa3
 2020-10-28 13:16:12 +00:00
George Chang
7e65d7f6fc Merge "Support RTL mode in payment option" 2020-10-28 12:42:11 +00:00
Treehugger Robot
15c5be7deb Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Iccc07e5d144297f5999f0ed324c0f2b0844e4c02
 2020-10-28 07:00:24 +00:00
Treehugger Robot
b50fba15b3 Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Ief5693cd34838cec35e7e5c650752c3b4cdb9d02
 2020-10-28 06:28:27 +00:00
Treehugger Robot
4e04e32679 Merge "Settings: Set preference controller for all VideoPreference widget usages" 2020-10-28 06:05:41 +00:00
George Chang
13f1c1249d Support RTL mode in payment option 
Bug: 156770848
Test: right-aligned under RTL mode
Change-Id: I01879056bbac08da0856f35012c8c8456328071c
 2020-10-27 11:49:33 +00:00
LuK1337
c6b9c9fa86 Settings: Set preference controller for all VideoPreference widget usages 
Fixes blank VideoPreference for settings with missing media.

Test: manual, open quickly open camera or other affected prefs
Change-Id: I5d4ffbcaa9fa1a344bb66abe53cc01e7be5e07b2
 2020-10-26 23:10:11 +00:00
Automerger Merge Worker
08d2eab4e5 [automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master am: bab12d1aa2 -s ours 
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 17ba8166a3 is in history

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

Change-Id: I6803f4fbde2b7ae9f6635ce4040f4d085900b56f
 2020-10-22 21:51:48 +00:00
Hall Liu
d51ee68578 Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I6ad3c840463bcb070769e9d91b2671d09f359369
 2020-10-22 21:49:15 +00:00
Automerger Merge Worker
bab12d1aa2 Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master 2020-10-22 21:35:15 +00:00
Hall Liu
5a5e0e021d Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I31b5513de4f5f9985f44ce124e4f0eea83ec107f
 2020-10-22 21:19:11 +00:00
Hall Liu
4af7d6a7d2 Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I02440f0bc76eea3d66526e7c1d02343893603cab
 2020-10-22 21:14:05 +00:00
Hall Liu
c2a4d3ec70 Merge "Replace TelephonyManager methods for mobile data" 2020-10-22 17:27:59 +00:00
Hall Liu
17ba8166a3 Replace TelephonyManager methods for mobile data 
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.

Exempt-From-Owner-Approval: Cherry-picked from internal
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
Merged-In: I7ebae37373d53fb2c59b6b546232dbddf77398d4
 2020-10-21 23:38:20 +00:00
Treehugger Robot
d719de84c1 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I91608590cc7b0255706d0ea4bdc896a778e72b8b
 2020-10-21 03:21:48 +00:00
Treehugger Robot
0a2c406023 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I195b2215ba250f7831de87d6b325560712fa8112
 2020-10-21 02:52:54 +00:00
Treehugger Robot
21846b228b Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" 2020-10-21 02:40:55 +00:00
Treehugger Robot
9d867703c5 [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

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

Change-Id: Ie60eb5b5524b59ab0f8b2aa4079c08a685b02577
 2020-10-20 19:34:05 +00:00
Treehugger Robot
bda0c67436 [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

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

Change-Id: I70a4a5ebc491947ec7d9205d54301eb5dc28f4b9
 2020-10-20 19:03:54 +00:00
Treehugger Robot
7881b23f1f Merge "Merge redfin/bramble support." 2020-10-19 23:20:09 +00:00
Xin Li
5734fefefa Merge redfin/bramble support. 
Bug: 171218636
Merged-In: I600c63a996b1684a2b801787d88974501062c073
Change-Id: I2d54882d98577db7f5c2a70281d626a726adf947
 2020-10-19 10:08:23 -07:00
Andrei-Valentin Onea
8e111e3de3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I60df429605c78749c0259f7efffab026210a4977
 2020-10-19 14:56:40 +00:00
Andrei-Valentin Onea
38747f76f3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I600c63a996b1684a2b801787d88974501062c073
 2020-10-19 14:37:30 +00:00
Andrei-Valentin Onea
2d57867aba Merge "Add support for @EnabledSince compat changes" 2020-10-19 14:19:31 +00:00
Amit Mahajan
0e5fdb184d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: If8cd3e5f3aec33840fc5a7477e2895dc6f2a158c
 2020-10-16 07:35:48 +00:00
Amit Mahajan
b09f09b02d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
 2020-10-16 06:39:15 +00:00
Amit Mahajan
7b9edcde47 Merge "Add the extra "Ask every time" if supported only" 2020-10-16 06:21:34 +00:00
Treehugger Robot
bfc09343cd Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da am: 6d5943e6b8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948

Change-Id: I6778ca0c8bed83621ae5ea38c184ad338b81279e
 2020-10-14 09:43:44 +00:00
Treehugger Robot
6d5943e6b8 Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948

Change-Id: I0ed900b4fcfb24200d68d7bbb802a5192d1f967b
 2020-10-14 09:24:07 +00:00
Treehugger Robot
3eb10277da Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" 2020-10-14 09:10:25 +00:00
TreeHugger Robot
e161ec59dc [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533 -s ours 
am skip reason: Change-Id I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d with SHA-1 064ba89fc3 is in history

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

Change-Id: I74fc436ded08114312544556de5293486fc94442
 2020-10-13 03:51:01 +00:00
TreeHugger Robot
4cee165533 Merge "Merge ab/6749736 in stage." into stage-aosp-master 2020-10-13 03:31:33 +00:00
Taesu Lee
50ef14540d Add the extra "Ask every time" if supported only 
Test: manual

Change-Id: Ie4bb150db41f1e654ea427a605050afbb57114cf
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2020-10-13 10:13:50 +09:00
Taesu Lee
7e0a1522c9 Remove dup READ_PRIVILEGED_PHONE_STATE permission 
Test: build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I877ac1631869e804a28a0f0d4c218ff1a8746dfd
 2020-10-12 17:48:34 +09:00
Jason Chiu
4b3d851f41 Reduce the flickering of injected items when package is changed am: e4b2b77452 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: Ib2ff68b59e8aa9567d1f6f7c7281832dd323c2dc
 2020-10-12 04:31:57 +00:00
Bill Yi
32105e95d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de21809c01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17ae8fd63ae635042a95f0bd6bf44e0fda74c426
 2020-10-09 13:32:50 +00:00
Xin Li
8656492241 Merge ab/6749736 in stage. 
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
 2020-10-08 23:40:50 -07:00
Bill Yi
de21809c01 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4b4ef8198075875b40875e95144cb7d130f10a70
 2020-10-08 20:51:34 -07:00