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

67360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Andrei Onea
f21ba0c650 Add support for @EnabledSince compat changes 
Bug: 49103556
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Change-Id: Iaf83b1ef2f07a910a3590f59562c2f638b5a6089
 2020-10-08 21:54:02 +01:00
TreeHugger Robot
f0313f1328 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 18:03:32 +00:00
TreeHugger Robot
d0147558bb Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 17:49:45 +00:00
Bill Yi
4c00a7338e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I194219f78cffa0b5e0c6e3230158dd700a7fc31a
 2020-10-07 07:10:55 -07:00
Bill Yi
d387c33f9a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iffd874c0f7449ca10692e382178347b5c9db8088
 2020-10-07 06:24:54 -07:00
Alexander Dorokhine
1b69ab26e9 Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661

Change-Id: Ifd04dfaf4e806be9ed084a7241ac1fba781511e1
 2020-10-06 10:19:41 +00:00
Alexander Dorokhine
c5a500bf07 Merge "Migrate away from deprecated Truth APIs." 2020-10-06 09:46:44 +00:00
Alexander Dorokhine
6decca7890 Migrate away from deprecated Truth APIs. 
This is a transitional step towards truth 1.0.1, where these APIs have
been completely removed.

Bug: 168765701
Test: m checkbuild
Merged-In: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
Change-Id: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
(cherry picked from commit 46e85a2fad)
 2020-10-06 00:25:04 -07:00
Treehugger Robot
fc6cb188b5 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I8342d2c6813115f9705ca2e5ef201125ea0f9576
 2020-09-29 05:13:43 +00:00
Treehugger Robot
177533ddbb Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-29 05:03:06 +00:00
Treehugger Robot
b4093123de Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: Icf8adbe951a8ac435cf3b035bab59508f5f48d0e
 2020-09-29 04:46:44 +00:00
Treehugger Robot
e0890849cd Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: Ie004598ea8d432d931a54469c1229e1b215ea759
 2020-09-29 04:46:30 +00:00
Treehugger Robot
8c58bd4520 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I8de47f938f94b000ba4274b3b4ef2ec77181b0e5
 2020-09-29 04:46:15 +00:00
Treehugger Robot
27978c5d47 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ia304c487a41b82f67d51542b09585b52c64ab94c
 2020-09-29 04:45:57 +00:00
Treehugger Robot
48c399c18a Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: If68a407eac5837b85781ae4eb20c4bfad1436700
 2020-09-29 04:45:22 +00:00
Treehugger Robot
93cec35cea Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-29 04:33:23 +00:00
Treehugger Robot
27806fde5e Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" 2020-09-29 04:30:56 +00:00
Treehugger Robot
1cd8904fc5 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" 2020-09-29 04:29:55 +00:00
Treehugger Robot
3eeb8b44c2 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" 2020-09-29 04:28:34 +00:00
Treehugger Robot
71c667322c Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" 2020-09-29 04:27:45 +00:00
Treehugger Robot
6891dd4590 Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491

Change-Id: I82d1bcd87109666b5b74e8d74811f423ae33105e
 2020-09-28 02:12:11 +00:00
Treehugger Robot
7f6271364b Merge "Avoid unexpected state changes for enhanced preferences" 2020-09-28 02:01:05 +00:00
tim peng
d3a9f472a2 Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258

Change-Id: Ie0aed850c6d0818070d162f4e99c633dc50ef204
 2020-09-24 12:02:53 +00:00
tim peng
594849082b Merge "Set highest priority as default value to Bluetooth codec" 2020-09-24 11:48:51 +00:00
Treehugger Robot
37be325d99 Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713

Change-Id: I4ca6e91aeba1cf349255101c0fe1629dc80aeaee
 2020-09-24 05:43:13 +00:00
Treehugger Robot
9d4bc729d9 Merge "Modify Wi-Fi settings owners file" 2020-09-24 05:24:27 +00:00