PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,782 Commits 1 Branch 0 Tags
1ad6bbad88b9dd22b3954fe3ed2bc65ac048ff9c
Commit Graph

77782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
22a70a5e15 [Settings] subscription UI should be closed when SIM is removed 
When SIM is removed, subscription UI should actively be closed (instead of
waiting for user to leave UI).

Bug: 160197149
Test: manual
Merged-In: I2854147c956faa633a9682eee0028db6cd2d3912
Change-Id: I920b88879a225f1d6ce696c7784d1f6f279c16d9
 2020-09-11 09:18:34 +08:00
Xin Li
3fd1488575 [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: Ie39f3baca4e2059d4e4e1db1a65dd42137223b9d
 2020-09-11 00:40:25 +00:00
Jeremy Goldman
a1aaccf670 [Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest 
1. Rather than mocking the PreferenceScreen, create an instance via
PreferenceManager. Rather than stubbing PreferenceScreen functions to
return the PreferenceCategory mock, the mock is inserted using public
functions.
2. PreferenceCategory active state is checked rather than verifying the
arguments of function calls.
3. mHeaderController test superclass overrides functions which use the
Lifecycle, because doReturn+when on Spy objects has undesired side
effects.
4. Looper message queue prepared for the PreferenceScreen.

Bug: 168130550
Diff: https://diff.googleplex.com/#key=w7a7L3seOowE
Test: atest -c MultiNetworkHeaderControllerTest
Change-Id: Ic66425aca4047d2eacd04509f3bfb315f6dd57fc
 2020-09-10 20:10:22 +00:00
Yi Jiang
c014151552 Merge "Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT" am: f7b60ee566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12543482

Change-Id: I0dafe9ea5d6806c68d8b166959653803ac4ea530
 2020-09-10 18:00:45 +00:00
Jeremy Goldman
1dfedb24c7 [Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest am: 4126ec2d32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12549080

Change-Id: I1443da523cc4b8504691a3303ee6c12ced520e49
 2020-09-10 18:00:05 +00:00
Yi Jiang
f7b60ee566 Merge "Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT" 2020-09-10 17:33:36 +00:00
Xin Li
36cfa7db8e Merge "Merge Android R" 2020-09-10 17:21:53 +00:00
Mariia Sandrikova
b74bf962cc Vertically center notification priority labels. 
Fix: 161297560
Test: manual
Change-Id: Idd4600a48e1ba50b9a861c9989de9baeb1493eab
 2020-09-10 16:52:15 +00:00
Jeremy Goldman
4126ec2d32 [Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest 
Test: atest -c EuiccPreferenceControllerTest
Change-Id: I028ca81d38252beb3abccef9e938988510f3f55e
 2020-09-10 15:19:01 +00:00
Jeremy Goldman
ff6bc3ce27 [Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest 
Diff: https://diff.googleplex.com/#key=OYsSkuGzJNkP
Test: atest -c MobileDataPreferenceControllerTest
Change-Id: I1a2d7b38023681f3db3320aa9f315109280cfbd0
 2020-09-10 15:15:08 +00:00
Yi-Ling Chuang
5601bce8dc Add a feature flag for settings contextual home. 
Bug: 168179764
Test: rebuild
Change-Id: Ib0a3c7ef9a80fe6fb0ddaa59a181af7dbb715db3
 2020-09-10 17:16:24 +08:00
TreeHugger Robot
f1ab7bc3ea Merge "Add a feature flag for silky home" am: 20d17a4ca5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12546612

Change-Id: I6e97d7576bca81b4fc237d6fcc2072d4aee78087
 2020-09-10 08:05:45 +00:00
Yi Jiang
038d18ff73 Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT 
Test: atest AdaptiveSleepDetailPreferenceControllerTest
Bug: 161938926
Change-Id: I4ed96ad36efe67091a26cbfe2cde16c116f7c8fb
 2020-09-10 00:58:03 -07:00
TreeHugger Robot
20d17a4ca5 Merge "Add a feature flag for silky home" 2020-09-10 07:55:43 +00:00
TreeHugger Robot
f24dbb2896 Merge "Update battery saver preference key" am: b7682b98ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416882

Change-Id: I79d46536e9ca37e401ab17ba701f7dbb85e60f4b
 2020-09-10 07:18:28 +00:00
TreeHugger Robot
b7682b98ec Merge "Update battery saver preference key" 2020-09-10 07:02:38 +00:00
Ted Wang
47f2ebb1af Update state when there is Bluetooth tethering state changed 
Monitor Bluetooth Tethering state and update preference when there is
Bluetooth tethering state change.
Add test case to verify when recieve
BluetoothPan.TETHERING_STATE_CHANGED will update bluetooth state

Bug: 138688805
Test: make RunSettingsRoboTests
Change-Id: I8f468d1d99ed6d87f6cd8305ef56b0d7a5dec95b
 2020-09-10 06:15:41 +00:00
Yanting Yang
5775d758e3 Add a feature flag for silky home 
Bug: 168166015
Test: robotest & rebuild
Change-Id: I1096f046acc7d34c2658caa2691884dcf0be7cfc
 2020-09-10 13:10:50 +08:00
Arc Wang
746176eb56 Create NetworkProviderSettings for provider model 
Provider model is a feature which improves networks
Settings UX.

NetworkProviderSettings is the fragment which allow
users to choose a mobile network or a Wi-Fi network
to connect.

At this change, NetworkProviderSettings is a clone
of WifiSettings, mobile networks will be integrated
at later CLs.

Bug: 167474581
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.NetworkProviderSettingsTest
Change-Id: I185639a8f2469e9ec76ad18b6c2bc2e8a4d079e3
 2020-09-10 11:03:48 +08:00
Betty Chang
29575ab4a4 Merge "[Testing] Use AndroidJUnit4 instead in NetworkDashboardFragmentTest" am: e8b877e3ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12536857

Change-Id: Idaa9d72f4b4988cd6a5b52f93319069d76a49a34
 2020-09-10 03:02:45 +00:00
Betty Chang
54d30c4d40 Merge "[Testing] Use AndroidJUnit4 instead in MobilePlanPreferenceControllerTest" am: 914fdb6b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533611

Change-Id: I019fdcdc63adc0e2f1d39e7a5d962a0ac8290f2d
 2020-09-10 03:02:37 +00:00
Betty Chang
e8b877e3ee Merge "[Testing] Use AndroidJUnit4 instead in NetworkDashboardFragmentTest" 2020-09-10 02:30:24 +00:00
Betty Chang
914fdb6b5f Merge "[Testing] Use AndroidJUnit4 instead in MobilePlanPreferenceControllerTest" 2020-09-10 02:30:09 +00:00
Kevin Chyn
a376fb08fa Merge "1/n: Clean up BiometricEnrollActivity" am: 3c3450e656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12550297

Change-Id: Ia31a28266057f3bbd60398fa6a1bf0eea28e9a01
 2020-09-10 01:45:32 +00:00
Kevin Chyn
3c3450e656 Merge "1/n: Clean up BiometricEnrollActivity" 2020-09-10 01:25:23 +00:00
TreeHugger Robot
c068c82e34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 700b219fb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I860ecb7701da5038b1249c09c3a0e9bf0a41344e
 2020-09-09 23:01:16 +00:00
TreeHugger Robot
4fe663be55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 29068a8310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16dfb02843bbfa242e33573bcbf66baf8efe01a4
 2020-09-09 23:00:30 +00:00
TreeHugger Robot
700b219fb1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-09 22:40:15 +00:00
TreeHugger Robot
29068a8310 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-09 22:29:15 +00:00
Kevin Chyn
eb8c0f14ea 1/n: Clean up BiometricEnrollActivity 
Test: fingerprint and face enroll via
      adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: credential enroll via
      adb shell am start -a android.settings.BIOMETRIC_ENROLL --ei android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED 32768

Bug: 162341940
Bug: 152242790
Change-Id: Idfdf96891ba9a2394f61eedb0adde2adf9fd85e6
 2020-09-09 15:07:24 -07:00
Bill Yi
e0e81b9e9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: c59dc080ce -s ours am: 64fd27fd35 -s ours am: 32589a674e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2579389d50eaef12b2b40ec2d4807daa658ad38
 2020-09-09 22:02:57 +00:00
Bill Yi
aeab09fbda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: 94d3a30bcf -s ours am: 51726dfb9b -s ours am: 733707023e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2bf7645778a8b24905ec07583e4de825447263c
 2020-09-09 22:02:49 +00:00
Bill Yi
ec3f40adc2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb -s ours am: ec05886ffb -s ours am: 807c4ed6e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id86f70ade8e9749022dea4f848e2d4704cbd08ff
 2020-09-09 22:02:05 +00:00
Bill Yi
32589a674e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: c59dc080ce -s ours am: 64fd27fd35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c99168a70bc12ef906ce13a8a347cddbb07f050
 2020-09-09 21:45:43 +00:00
Bill Yi
733707023e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: 94d3a30bcf -s ours am: 51726dfb9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2f72cd6d841e69446829353ba757b6cf75255f2
 2020-09-09 21:45:26 +00:00
Bill Yi
807c4ed6e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb -s ours am: ec05886ffb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b71254bab7afbf816e03c97090da2433e2a941a
 2020-09-09 21:44:53 +00:00
Bill Yi
64fd27fd35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: c59dc080ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01197f570e0cc53a724b1ee64819aab2ed954b43
 2020-09-09 21:36:37 +00:00
Bill Yi
51726dfb9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: 94d3a30bcf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icee599694366364e6625d00674516d24621dba9b
 2020-09-09 21:29:42 +00:00
Bill Yi
ec05886ffb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8817d412d60565eaba0e7fe6d08209086f83361d
 2020-09-09 21:29:28 +00:00
Bill Yi
c59dc080ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c1aa46ba97bfd9094471fc00a2c62fdabba6313
 2020-09-09 21:09:58 +00:00
Bill Yi
94d3a30bcf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddec8911b06b8da1cf5244c44e505139a48d8453
 2020-09-09 21:09:57 +00:00
Bill Yi
c01738f847 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1a15ffc0e8765702dc2468d075d3348ed69151c9
 2020-09-09 15:52:22 +00:00
Bill Yi
7840751e7d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d7aa572632771bb3bb165d0d4d9ad9f7302d574
 2020-09-09 15:12:21 +00:00
Yanting Yang
336831c459 Merge "Resolve tiles intent before prompting a dialog for profile selection" am: 7b8b881f8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12401652

Change-Id: I06a28acdb2f757d6fee843f43c8a9c6bbff458e3
 2020-09-09 15:04:17 +00:00
Yanting Yang
7b8b881f8a Merge "Resolve tiles intent before prompting a dialog for profile selection" 2020-09-09 14:44:35 +00:00
Bill Yi
ae0c6a9fdb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9cb199fccd6af58b074819d1fdd3d2404fcddfc9
 2020-09-09 14:34:33 +00:00
Bill Yi
28825ad9e4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f
 2020-09-09 13:56:30 +00:00
Yanting Yang
552f340dda Resolve tiles intent before prompting a dialog for profile selection 
Symptom:
Once the work profile component of the tile is disabled after Settings
preloaded tiles, Settings will crash when the user clicks the work
option from the profile selection dialog.

Root cause:
Settings just checks the users from the preloaded tiles to prompt
profile selection dialog. It doesn’t check the activity for the work
profile user before launching.

Solution:
Resolve the activity by intent as users before launching if the work
profile is enabled. Directly start activity if only one user is
resolvable, otherwise prompt a dialog for profile selection.

Fixes: 162227425
Test: make RunSettingsRoboTests
Change-Id: Idcc4e5a266ab2a2252db30bb97d4be002212c677
 2020-09-09 18:12:42 +08:00
PETER LIANG
1bf4a12e9d Merge "Add the gray color into the palette for color correction." am: 0f61d2aa31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533605

Change-Id: I76da6fe8fbaee7bba5a3a41dd0e7b4c243e050ce
 2020-09-09 09:52:23 +00:00
PETER LIANG
0f61d2aa31 Merge "Add the gray color into the palette for color correction." 2020-09-09 09:09:35 +00:00