PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,353 Commits 1 Branch 0 Tags
a815a12c4080d89c67fd4c19e639e173cfadebb8
Commit Graph

71353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
159de41477 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 am: 2f068a914e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
 2020-09-29 06:18:19 +00:00
Treehugger Robot
2f068a914e Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I63d1925ed0bb4347098b926e27dcd4b8887421a4
 2020-09-29 06:04:54 +00:00
Treehugger Robot
c0dbafc438 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 am: 722f9f4ea8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: I3f2fb62790ba30914d1b7a5555809954066e0455
 2020-09-29 05:29:52 +00:00
Treehugger Robot
580963266b Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db am: 6513978872 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: Ia6cbd95f410a4763b5a4a066b942e1fcd44b0fb1
 2020-09-29 05:29:43 +00:00
Treehugger Robot
4d513437aa Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 am: 24dc71f7e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I7ded23298875715dec1a48d9364a174639b7f92b
 2020-09-29 05:29:33 +00:00
Treehugger Robot
be8b195fe1 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I844668256cf7b87f6dc29272e3d01c7c51b813e5
 2020-09-29 05:29:24 +00:00
Treehugger Robot
6ace0ecdde Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 am: bb98b793e5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ieb22f4b036c3a569acdf9ea4451fba7b5d7a9851
 2020-09-29 05:29:21 +00:00
Treehugger Robot
7b7382fdf2 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b am: 7f3bbcddf0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: Ia130edabc0cb44a787ef107641e39ead544d81af
 2020-09-29 05:29:07 +00:00
Treehugger Robot
722f9f4ea8 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: If21308e7f0e67eb39c791206f1e0ee05697b54e8
 2020-09-29 05:14:28 +00:00
Treehugger Robot
6513978872 Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: I9e08c98c28e15bc5833d4c23e569a83840d40172
 2020-09-29 05:14:19 +00:00
Treehugger Robot
24dc71f7e8 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I3bf65953a9751b8cfd9dab666f5b1ad400bbdd36
 2020-09-29 05:14:11 +00:00
Treehugger Robot
bb98b793e5 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ic774e63dd14139999e96210bc89476edc095e02b
 2020-09-29 05:14:03 +00:00
Treehugger Robot
7f3bbcddf0 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: I4397688b601c1a8bd53ce49b5ec6db16eff9db5a
 2020-09-29 05:13:51 +00: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
e13fa41a29 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

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

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

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

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

Change-Id: I716f8a88d3d6a6022d679736bb278d3f9eb638bb
 2020-09-29 05:00:12 +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