PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,012 Commits 1 Branch 0 Tags
456b2bf87b00ef7f9dde561bc6df13811f0e8b8c
Commit Graph

60012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anna Trostanetski
805f137935 Merge "Fix PlatformCompatDashboardTest." 2020-03-09 10:53:02 +00:00
Yi-Ling Chuang
40e8c1523b Fix WirelessDebuggingEnablerTest failures. 
Fixes: 151065069
Test: robotests
Change-Id: I0bd04e95a66113f379ca7328a4cd31df0ce40b54
 2020-03-09 18:36:25 +08:00
Jason Chiu
130629b1db Show paired devices on Bluetooth device slice card 
- support tapping to activate for all available media devices including
  Hearing aid and Headset
- support tapping to connect for previously connected devices

Bug: 149667096
Test: robotest
Change-Id: I25f74b1b20fbb1876200a561775aa675ff60ac37
 2020-03-09 17:43:29 +08:00
Alex Johnston
dd1747011a Add policy transparency dialog to 'Remove work profile' 
* For a work profile on an organization-owned device,
  no explanation was being shown to the user as to
  why the work profile cannot be removed.
* This CL adds a policy transparency dialog when the
  'Remove work profile' option is selected in the
  'Device Admin' Settings screen.

Bug: 149391073
Test: Manual testing
      atest com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAddTest
Change-Id: I8221973ed16fcc7c79f5897c3bea063050ae00a6
 2020-03-09 09:25:49 +00:00
Tim Peng
9c2968ab21 Update rule to display output switcher Slice 
-Display when Cast device is available
-Add test case

Bug: 150907688
Test: make -j42 RunSettingsRoboTests
Change-Id: I1aa2fbe7b77a0274816af47bbc372eae9d7944c9
 2020-03-09 16:29:53 +08:00
Automerger Merge Worker
0571803b3e Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b 
Change-Id: I1aee655c4001e52f3af2ffe8b22c3edb615acee0
 2020-03-09 08:20:59 +00:00
Menghan Li
42dcad9b2b Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev 2020-03-09 08:01:56 +00:00
Automerger Merge Worker
9b0ed6dfbf Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 
Change-Id: I5b68b2275b29089ebb9c6b509a02cc6f857a23e5
 2020-03-09 05:29:48 +00:00
TreeHugger Robot
5a4257deb4 Merge "[Wi-Fi] Remove redundant code" into rvc-dev 2020-03-09 05:15:25 +00:00
Automerger Merge Worker
d4970a9df1 Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 
Change-Id: I035e835ec5565100464fe1b14108b49cedca7546
 2020-03-09 04:13:27 +00:00
TreeHugger Robot
bde2d44bb1 Merge "Refresh summary when update state of preference" into rvc-dev 2020-03-09 04:01:11 +00:00
Automerger Merge Worker
0e05847f2b Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 
Change-Id: Ia4f3155fd2820da536e1f9822ca181ab625d36d7
 2020-03-09 03:45:29 +00:00
TreeHugger Robot
7d6011be10 Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev 2020-03-09 03:29:30 +00:00
Arc Wang
ced9c346a5 [Wi-Fi] Remove redundant code 
Should not setSummary in ConnectedWifiEntryPreference because
WifiEntryPreference updates summary by WifiEntry#getSummary

Bug: 150911380
Test: manual
      See captive portal Wi-Fi summary 'Sign in to network'
      before logging in.
Change-Id: Ibc47623d66b9d2844c0ca827081f205f0bab89e7
 2020-03-09 10:47:58 +08:00
Automerger Merge Worker
3bc7a52a36 Merge "Update failed test case" into rvc-dev am: 9e5142b14d 
Change-Id: Ia0a7848915d207d69b051cfee0ef1547ae98a0f6
 2020-03-09 02:10:34 +00:00
tim peng
9e5142b14d Merge "Update failed test case" into rvc-dev 2020-03-09 01:53:35 +00:00
Automerger Merge Worker
824aec4faf [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4f446401a416b8720e06c08882649f719b4dd215
 2020-03-08 20:22:16 +00:00
Bill Yi
9ce0e0ca55 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I7966ad0beaa4bde063f8fc3ec17ce152b9acb3ac
 2020-03-07 22:06:24 -08:00
Automerger Merge Worker
c799d3bc49 [automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours 
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1 is in history

Change-Id: I8352d1b47e9d8bb71442d0f62bdf3717794d1089
 2020-03-08 05:26:30 +00:00
Automerger Merge Worker
0fae3591e4 Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b 
Change-Id: Ibb8fba2dfeca99e2c5db00039e5af926fef7ff56
 2020-03-08 05:26:17 +00:00
Automerger Merge Worker
1ec7c14b3b Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e 
Change-Id: Ia3bdc608b679922f93398ba3c11a9f393374548a
 2020-03-08 05:10:45 +00:00
Treehugger Robot
a49021a71e Merge "PreferredNetworkModePreferenceController's summary no 5G item" 2020-03-08 04:52:56 +00:00
Automerger Merge Worker
ff11b08361 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 
Change-Id: Idfdbf2f0c4684d5fa7934937a39be401a139362a
 2020-03-07 17:37:49 +00:00
TreeHugger Robot
29063e3779 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev 2020-03-07 17:16:05 +00:00
Automerger Merge Worker
384841ce59 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 
Change-Id: Ib7321fd67b98731a9c822d2143316d60017bdd2e
 2020-03-07 12:39:54 +00:00
TreeHugger Robot
4105c9c576 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev 2020-03-07 12:27:45 +00:00
Automerger Merge Worker
b7f10b9012 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 
Change-Id: If7503971a68c00057e6256ae32f032edc8b61a2d
 2020-03-06 22:45:48 +00:00
Kevin Chyn
be753c3543 Merge "Update enrollment with API update" into rvc-dev 2020-03-06 22:43:57 +00:00
Automerger Merge Worker
e47d1cae4f Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 
Change-Id: If8394b1d01bd07daeb6d53988a0844467b5fb336
 2020-03-06 21:46:58 +00:00
Quang Luong
858cf42516 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev 2020-03-06 21:36:30 +00:00
Brad Ebinger
60204898ec Fixes ContactDiscoveryDialogFragmentTest 
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
 2020-03-06 20:54:00 +00:00
Automerger Merge Worker
045a1c53b0 Merge "Log errors on history load" into rvc-dev am: d27d2b375e 
Change-Id: I6d67f30948567491a777c505b18084e383d4fa4b
 2020-03-06 20:35:26 +00:00
Julia Reynolds
d27d2b375e Merge "Log errors on history load" into rvc-dev 2020-03-06 20:23:02 +00:00
Automerger Merge Worker
b2d8e01b7a [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 
Change-Id: I4aa269491f46a80bcf05ac2afb4fc428e34ae83a
 2020-03-06 16:32:24 +00:00
Automerger Merge Worker
b329c29a04 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929 is in history

Change-Id: I5746e863609c14f30eaa6284463046a853e9323a
 2020-03-06 16:31:58 +00:00
Automerger Merge Worker
eae534cda7 [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours 
am skip reason: subject contains skip directive

Change-Id: Id498eb2c8fe327e3639328d488db5900174240ec
 2020-03-06 16:18:58 +00:00
Automerger Merge Worker
9a4bdcaca6 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ac28217bd616bc49859f09a9eab0a20e1d5d285
 2020-03-06 16:17:35 +00:00
Julia Reynolds
78b1848509 Log errors on history load 
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
 2020-03-06 10:05:30 -05:00
Automerger Merge Worker
1ab6e8b4fb Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f 
Change-Id: I9816aac3c87fa49554badf0710edd3a217dee6bc
 2020-03-06 14:41:27 +00:00
Anna Trostanetski
f1fe93bc2f Merge "Fix PlatformCompatDashboardTest." into rvc-dev 2020-03-06 14:38:29 +00:00
Automerger Merge Worker
ba597a6f39 Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 
Change-Id: I6c363e7a541aa37d77897466fac1e188be9283cc
 2020-03-06 14:23:13 +00:00
tim peng
c241e434d5 Merge "Add string for output switcher transferring state" into rvc-dev 2020-03-06 14:08:28 +00:00
Arc Wang
f5e9927668 [Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon 
click the gear icon will always switch to Wi-Fi detail screen.

Bug: 150911380
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedWifiEntryPreferenceTest
Change-Id: I640d180ae5684ffaa9b2adec7b1be401b2bfd89d
 2020-03-06 19:27:08 +08:00
Automerger Merge Worker
2bce5cdd68 Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 
Change-Id: I679f15c379b1ac742d9573052921f1e1080f1e65
 2020-03-06 10:25:32 +00:00
Automerger Merge Worker
3f5aa48b55 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 
Change-Id: Ia8c7631512d6e65752bb67b630254c9975d9dacb
 2020-03-06 10:25:11 +00:00
Automerger Merge Worker
b4e56a9f35 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 
Change-Id: Ie89044a623e320ef2b790a8f89e271988de0531a
 2020-03-06 10:24:41 +00:00
Automerger Merge Worker
abbb4ee257 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb 
Change-Id: I71aa23a4d507d3266e096cec04c22a706ba2eb0a
 2020-03-06 10:24:09 +00:00
Automerger Merge Worker
545d58d702 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 
Change-Id: I8e638569fd4567519f1b2072a3b77aeff74568a9
 2020-03-06 10:23:55 +00:00
Tsung-Mao Fang
91399607fe Fix pendingIntent in SettingsSliceProvider could be Hijacked 
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.

So, we enfore assign the package name for this intent,
it only can launch the settings app.

Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.

Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1)
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
 2020-03-06 18:14:03 +08:00
menghanli
5d7083a103 ShortcutPreference Toggle design (2/n) 
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.

Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
 2020-03-06 18:02:53 +08:00