Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,398 Commits 1 Branch 0 Tags
e22c2757c4c33cdbee2fba4c9d1b9fe6d0b2ba0d
Commit Graph

30197 Commits

Author SHA1 Message Date
Betty Chang
49f3da75cc Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" 2020-02-27 06:10:04 +00:00
Automerger Merge Worker
b71753f4e9 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: a642ed8dba am: ab139d4620 
Change-Id: I76030197c101393b1fd98da1b4bf6bea2a1c804f
 2020-02-27 04:38:45 +00:00
Automerger Merge Worker
a642ed8dba Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 
Change-Id: I8cb33aed6148d23d59f5757da26c40cbd602242d
 2020-02-27 03:44:12 +00:00
Automerger Merge Worker
71a3a316a5 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: 5d4e63734e am: b91c0a90dc 
Change-Id: I5c3d640cebd486da4bebbcab715a9029f46242e5
 2020-02-27 03:16:52 +00:00
TreeHugger Robot
640245cda6 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev 2020-02-27 03:15:29 +00:00
Automerger Merge Worker
b91c0a90dc Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: 5d4e63734e 
Change-Id: I3f58b9bc451dcd9ec9f0fad32a5b552ddb9bf7ca
 2020-02-27 03:00:31 +00:00
Automerger Merge Worker
b89c028b6d Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 
Change-Id: I3c0fb3002cf73110060dbff2d3095eebe08d1362
 2020-02-27 02:45:29 +00:00
tim peng
b6c8fab86f Merge "Launch output switcher with media package information" into rvc-dev 2020-02-27 02:18:03 +00:00
Automerger Merge Worker
c19a0bfd48 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: c980fd89d5 am: e5f870cb5b 
Change-Id: I4dd494fdd244addb6e8529d3b6a41b36da77f285
 2020-02-27 00:24:43 +00:00
Automerger Merge Worker
e5f870cb5b Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: c980fd89d5 
Change-Id: Idedb5fed62a4ac912b6471f7a33ec11363fed7c5
 2020-02-27 00:15:07 +00:00
Automerger Merge Worker
5145c82a2e Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 
Change-Id: I41d6c5acfac1296fb7500ed4a7e7998847776c16
 2020-02-26 23:44:06 +00:00
David Su
5c69259751 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev 2020-02-26 23:42:35 +00:00
Yi Jiang
ae7ff0c7f1 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" 2020-02-26 21:41:40 +00:00
Automerger Merge Worker
25e78ab67b Include changes that happen when history is open am: 8b031276b7 am: d60d581e78 am: d9a7a6f881 am: d0776ff37d 
Change-Id: I3fbd30feb8534e8e29d387bb37d25a2c10a747b4
 2020-02-26 16:58:32 +00:00
Automerger Merge Worker
d0776ff37d Include changes that happen when history is open am: 8b031276b7 am: d60d581e78 am: d9a7a6f881 
Change-Id: Id6c205ea48d1c3dc35fc5d1e729f06e556520f43
 2020-02-26 16:40:46 +00:00
Automerger Merge Worker
70e242c19c Include changes that happen when history is open am: 8b031276b7 
Change-Id: I46e0855230e7f2cd36fbd3f38ec27d0a5f992074
 2020-02-26 16:13:36 +00:00
Julia Reynolds
8b031276b7 Include changes that happen when history is open 
Test: manual
Fixes: 150202759
Change-Id: Ic05be6c5c85a16567556d3f3902f4d557a8e7c1f
 2020-02-26 12:42:57 +00:00
changbetty
f64e2b3d10 [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: Manual and make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
 2020-02-26 18:30:14 +08:00
Automerger Merge Worker
22d09f7a23 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 am: fe90e0f750 am: cd83b8f450 
Change-Id: I80e5fb347e321974a0cf97df76595cf29b36a5d1
 2020-02-26 05:34:18 +00:00
Automerger Merge Worker
fe90e0f750 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 
Change-Id: Ide5a5710d57542e239105c5e14ab11f3167ab42b
 2020-02-26 05:00:35 +00:00
Automerger Merge Worker
1d63b3f5c6 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 
Change-Id: Id570b28ba84f3d7de23fe399044f99d6766f0ede
 2020-02-26 04:45:05 +00:00
Julia Reynolds
9f6351b596 Merge "Stop controller from steal preference clicks" into rvc-dev 2020-02-26 04:32:52 +00:00
Automerger Merge Worker
e6dfc725db Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 
Change-Id: I644d6ae2ccebe74f3f6201e4b5595d06559d83da
 2020-02-26 03:03:54 +00:00
Yi Jiang
c0f9424779 Fixes incorrect settings usages in AdaptiveSleepPreferenceController 
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
 2020-02-25 13:48:06 -08:00
Julia Reynolds
bc0c7a626d Stop controller from steal preference clicks 
Test: atest
Fixes: 150175360
Change-Id: Ia22058df0ddbd1a274a508e2600d12aa1b67a343
 2020-02-25 10:49:23 -05:00
Peter_Liang
ab05476fc1 Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. 
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.

Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
Merged-In: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
(cherry picked from commit 10bc375176)
 2020-02-25 09:06:12 +00:00
Automerger Merge Worker
c57bd18269 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 am: 7991e1fe7a am: f5b2f92b22 
Change-Id: I1c352890213d15e6f8a48e891839034d372e037a
 2020-02-25 08:19:58 +00:00
Automerger Merge Worker
7991e1fe7a Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 
Change-Id: Ib8cb42e69124e79c455a78efae655f99be3921c5
 2020-02-25 07:59:29 +00:00
Automerger Merge Worker
622e966881 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b 
Change-Id: I38485ff2569e2c3e679676c490c25ddb25d86145
 2020-02-25 07:48:31 +00:00
Tim Peng
14d0d125b4 Launch output switcher with media package information 
-Output switcher would include transferable devices when media is active
-Output switcher would only include system devices when no media is active
-Add test cases

Bug: 150179490
Test: make -j42 RunSettingsRoboTests
Change-Id: Ice0048d3a0b78e02ec21dd3664efc0239abbb9cb
 2020-02-25 15:45:56 +08:00
Jack Yu
490eba353b Merge "Added slot index in area info broadcast" into rvc-dev 2020-02-25 07:41:37 +00:00
Automerger Merge Worker
0577514d0d Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6 
Change-Id: If80a964d28950288f042d4a1ccfc183b9c4f0067
 2020-02-24 22:15:49 +00:00
Automerger Merge Worker
2d84cdbc3a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a 
Change-Id: Idc2d504f99fdea780fcda81a221e2f57bc242e82
 2020-02-24 21:36:32 +00:00
Automerger Merge Worker
840506e88a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 
Change-Id: Ifa566bf809360db17a6932ee5ebaede2eb63e1b3
 2020-02-24 21:15:28 +00:00
Xiangyu/Malcolm Chen
aaee4539c7 Merge "Catch crash in mobile network ProgressDialog" 2020-02-24 21:07:17 +00:00
Jack Yu
5a4dabcba2 Added slot index in area info broadcast 
Added slot index information in the broadcast
so the receiver knows which slot to get information.

Test: Manual
Change-Id: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Fix: 150126754
 2020-02-24 11:54:34 -08:00
TreeHugger Robot
520cb5851c Merge "Keep contextual card dismissal info upon deletion" into rvc-dev 2020-02-24 11:07:19 +00:00
TreeHugger Robot
bdf85c224b Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev 2020-02-24 10:03:53 +00:00
Shafik Nassar
651e4b32fc Merge "Use AppOpsManager#setUidMode instead of #setMode" 2020-02-24 09:25:02 +00:00
Jean Chen
ad2dc2b361 Merge "Support caption second UI structure (5/n)" 2020-02-24 07:48:13 +00:00
govenliu
7d8d8d3400 [Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature. 
Issue: Openroaming detail page have new UI Mock.
Solution: Apply the mock design to rollback previous UI and add one Subcription preference.

Bug: 146669261
Test: manually push API and check.
Change-Id: Ie3243c9bcd371db1909834ef257c741454abec11
 2020-02-24 15:40:23 +08:00
Yi-Ling Chuang
5f8a084909 Keep contextual card dismissal info upon deletion 
Add a config for contextual dismissal. This config is used to
determine whether the existing dismissal timestamp should be
kept before an insertion.

The new dismissal behaviour design replaces the boolean
value(isDismissed) with a long value(dismissedTimestamp) to give
this behaviour more flexibility. Utilizing the timestamp allows
developers to define new criteria of card's display (e.g cards being
dismissed can be shown again after a period of time).

While newly inserted data from SettingsIntelligence or other clients
may not have dismissal timestamp recorded. Turning on the config gives
the capability to persist dismissal timestamp, and more customized
behaviour can be created.

Bug: 143055685
Test: robotests
Change-Id: I9d095955e9c51f2aa3332d49ee230d3ded9ae744
Merged-In: I9d095955e9c51f2aa3332d49ee230d3ded9ae744
(cherry picked from commit 377125bf96)
 2020-02-24 07:14:12 +00:00
Jason Chiu
c56ce8d647 Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController 
Fixes: 149373695
Test: build, manual
Change-Id: I7501ef393e226bb38c72a1ee465bf9c72586716b
Merged-In: I7501ef393e226bb38c72a1ee465bf9c72586716b
(cherry picked from commit c0543e833f)
 2020-02-24 06:19:11 +00:00
Jason Chiu
05f5b8e7c4 Bluetooth device slice improvement 
- remove "Pair new device" row
- change the on/off toggle to a plus button for pairing new device
- roll back the title "Bluetooth devices"

Bug: 149667096
Test: robotest
Change-Id: I47e9c47b2ab0adacdbdbde34522d7c0172adda75
Merged-In: I47e9c47b2ab0adacdbdbde34522d7c0172adda75
(cherry picked from commit 5e462a852b)
 2020-02-24 06:16:18 +00:00
TreeHugger Robot
84812f661b Merge "Bluetooth device slice improvement" 2020-02-24 06:14:59 +00:00
David Su
b03044351e Rename WifiNetworkSuggestion#getPasspointConfiguration 
Renamed to getPasspointConfig to be consistent
with setPasspointConfig

Bug: 149912516
Test: compiles
Change-Id: I5809f50793f89eb3b811c019b7494a437dd991e7
 2020-02-23 19:12:02 +00:00
TreeHugger Robot
a43c90c64a Merge "Keep contextual card dismissal info upon deletion" 2020-02-22 12:49:40 +00:00
TreeHugger Robot
2f011c4246 Merge "Support autoclick secondary action (8/n)" 2020-02-22 10:28:40 +00:00
TreeHugger Robot
8e379934c5 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" 2020-02-22 10:24:51 +00:00
PETER LIANG
237491d6a3 Merge "Fine-tune the widget of "Allow rich content in Accessibility Settings" for security." 2020-02-22 03:00:43 +00:00