Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,303 Commits 1 Branch 0 Tags
ebff3f6aefbf2e4d9a9212071b6ecc6e4f14ccb7
Commit Graph

31086 Commits

Author SHA1 Message Date
Alic Tsai
94a964df39 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0 am: d4ad3f6843 am: b2427ccab5 
Change-Id: If3f2ff47dc1d4134ea0190b236f2589d316c79cf
 2020-03-27 13:19:20 +00:00
Alic Tsai
d4ad3f6843 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0 
Change-Id: I990048d040bb1626a457ab8371d9482ee5053a68
 2020-03-27 12:50:04 +00:00
Alic Tsai
df8b9acc69 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev 2020-03-27 12:20:35 +00:00
Tobias Thierer
32e960d249 Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2 am: f5b13fe3b1 am: 949525df32 am: 2b55e30d8e 
Change-Id: Id4cb3a060938a17eb577a55cc50538b4084e9d9a
 2020-03-27 12:20:11 +00:00
Tobias Thierer
f5b13fe3b1 Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2 
Change-Id: Ie2a65cdd33e7922685153fcb1eb17791fcf562a6
 2020-03-27 11:51:34 +00:00
Tobias Thierer
21b01bc4f2 Merge "OWNERS: Remove tobiast." am: dffcd7a949 
Change-Id: Iad09bc83fa7f258f83ee505a4cd9edf9004f542d
 2020-03-27 11:30:14 +00:00
Tobias Thierer
dffcd7a949 Merge "OWNERS: Remove tobiast." 2020-03-27 11:04:12 +00:00
James Lin
dc442ab150 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 am: 2f5d2a48c1 am: b6d18514ae 
Change-Id: I5f0b20810ab2038b72dc335bb9516b5469096c6b
 2020-03-27 10:58:06 +00:00
James Lin
2f5d2a48c1 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 
Change-Id: Idc57a86546b7e42adeebf1743ef90fec4baf43a6
 2020-03-27 10:29:18 +00:00
James Lin
24c06447db Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 
Change-Id: I8a5a565e71981e4faa323f82424c927783d42e06
 2020-03-27 10:14:05 +00:00
James Lin
a7a3304a20 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev 2020-03-27 09:56:32 +00:00
Edgar Wang
ecc880efb5 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: 1d1edc8737 am: c6f7da3787 
Change-Id: I9f57fb58181c8c6e78aad4d8cb09d8649513cde3
 2020-03-27 06:42:37 +00:00
Edgar Wang
1d1edc8737 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e 
Change-Id: I54572bfb11b5134ed69352e34eb8fb5a520c9290
 2020-03-27 06:10:46 +00:00
Edgar Wang
890fc578f8 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 
Change-Id: If1815f491e3824dfe75e2e677a4effbddb7f73fe
 2020-03-27 05:53:21 +00:00
Edgar Wang
d981e24705 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev 2020-03-27 05:40:33 +00:00
alictsai
6b76eb0ab6 Device details LCR should be show up " ! " with low battery. 
screenshot:
https://screenshot.googleplex.com/f72YS3THutW.png
https://screenshot.googleplex.com/v6uw7XsOs9x.png

Bug: 151187813
Test: make -j42 RunSettingsRoboTests
Change-Id: Iabb4ac54e6f827f54cd7c5512995f185875e4a06
 2020-03-27 13:14:01 +08:00
TreeHugger Robot
b137f1af65 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 35adcca607 am: 97ac18af4e am: 903b61333c 
Change-Id: I8a511744142be14f97f5aa24e685f0e5a9792d4b
 2020-03-27 04:22:06 +00:00
TreeHugger Robot
35adcca607 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 
Change-Id: Ida02e3e49ab0210d8494d6e919b5048895f1eae0
 2020-03-27 03:28:47 +00:00
TreeHugger Robot
b11a46cfd5 Merge "Update customize button title when state changed" into rvc-dev 2020-03-27 03:17:25 +00:00
James.cf Lin
9f8edf2b67 Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type 
After setting the network to telephony framework, Setting UI didn't check this network type when show on the UI and show the invalid string.

Bug: 152373426
Test: manual
Change-Id: Ibf280a9905edcb7bd241a1505e85ac5e83993634
 2020-03-27 09:54:08 +08:00
Philip P. Moltmann
5f242c05e3 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 716ff8c256 am: b8e47e2ad5 
Change-Id: Ibb897c94ae09966c3c9983e504b14c2c983ab04e
 2020-03-27 01:37:05 +00:00
Xiangyu/Malcolm Chen
2fab5e95ec Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 90f9b73775 am: e9b0810465 
Change-Id: I8afa4b655a8a1096d93828b6854c72979699f8d7
 2020-03-27 01:33:28 +00:00
Philip P. Moltmann
716ff8c256 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d 
Change-Id: Ie7713b153c189a48770f91d85e6b4562d7bd1842
 2020-03-27 00:59:36 +00:00
Xiangyu/Malcolm Chen
90f9b73775 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb 
Change-Id: If6e8b2f0b0e6b4031bf850577849ce4bbdf6fede
 2020-03-27 00:58:12 +00:00
Philip P. Moltmann
e7466934b7 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 
Change-Id: I3a36b7b0561cb630c115e000294e32fe378a94a1
 2020-03-27 00:47:23 +00:00
Xiangyu/Malcolm Chen
0e4d8aa531 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 
Change-Id: Id7cec642292dab8ec19bb33ab8247d7f3b0d2865
 2020-03-27 00:44:30 +00:00
Philip P. Moltmann
1e812204e4 Merge "Only check op in Settings UI" into rvc-dev 2020-03-27 00:25:38 +00:00
Xiangyu/Malcolm Chen
b0a5905d08 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev 2020-03-27 00:24:23 +00:00
TreeHugger Robot
ebe03ee645 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 23188466eb am: ea2948eaaa 
Change-Id: I844e7151e9f23a0d1ce6cb6b04432d80bb3a1cbe
 2020-03-26 22:10:28 +00:00
TreeHugger Robot
23188466eb Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd 
Change-Id: I768ea3ffd82421631d17f04cf3d857cc8250da08
 2020-03-26 21:18:13 +00:00
TreeHugger Robot
908fff9099 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 
Change-Id: Ibc83796466da9e39440c205d47ba059b4908175f
 2020-03-26 21:06:30 +00:00
TreeHugger Robot
7440bf7034 Merge "DND Bypassing Apps redesign" into rvc-dev 2020-03-26 20:54:33 +00:00
Malcolm Chen
b5e7565175 Show footer to notify user no 5G in DSDS mode. 
Bug: 151657272
Test: manual and robotests
Change-Id: I5df95528aae12b43a15389b8048f14d9508272f3
 2020-03-26 10:31:42 -07:00
Beverly
f707950ee7 DND Bypassing Apps redesign 
- Add link in DND Conversations Page to the overall conversations list
Settings page
- Add custom_rule xml pages for custom schedule rule settings for
messages and calls (so the UI is the same as before the message/calls
redesign)
- Change app exceptions to display apps with subtext indicating which
notitfication channels are allowed to bypass dnd (previously, would
display each channel individually)
- Add individual AppBypassDnd channel pages where users can decide which
channels will bypass DND for an app on a single page
(AppChannelsBypassingDndSettings)
- Only remove dnd bypassing apps preferences from the preference list if the list changed,
else just update the preference itself to avoid the list from flashing

Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: If12d8921e1405aefb1066acc2ef5c55d216fe47a
 2020-03-26 16:49:17 +00:00
TreeHugger Robot
70d4ea36b6 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: 71791d7e02 am: d0ff75aefa 
Change-Id: Iff645fdb71c160abb7d38f4fcc56076fc10addc5
 2020-03-26 16:02:43 +00:00
TreeHugger Robot
71791d7e02 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d 
Change-Id: I550cc778b65683cbf2aed3441db7270d00021213
 2020-03-26 15:28:26 +00:00
TreeHugger Robot
6b37d4d4f1 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c 
Change-Id: I8e2d6cf302840e650f19caf6290f49542bcdd5f0
 2020-03-26 15:05:36 +00:00
TreeHugger Robot
6f16992d3c Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev 2020-03-26 14:57:44 +00:00
Alex Johnston
40417d3efe Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: cf38af6de6 am: bd706ef24f 
Change-Id: If66284619518916e18d867a10cbc42a635d69317
 2020-03-26 14:10:31 +00:00
Alex Johnston
cf38af6de6 Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 
Change-Id: Ic438fc8b8ba8a62cb718f18a5edb83066f132efe
 2020-03-26 13:38:54 +00:00
Alex Johnston
47415a0a45 Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef 
Change-Id: Ib57653e7b2937b6375b2aa287622a900083e723c
 2020-03-26 13:19:43 +00:00
Alex Johnston
7bc50ac2ef Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev 2020-03-26 12:58:49 +00:00
Tobias Thierer
a854ddae3d OWNERS: Remove tobiast. 
Test: Manual CL review only.
Bug: 152399425
Change-Id: Ifca2d6e8ecd59a924c6e5d8ca60749be5d5c8728
 2020-03-26 12:17:00 +00:00
govenliu
0fc956bc57 [Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint. 
Because WifiTracker2 refactoring in framework side is done, Settings App need to refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.

Bug: 152454787
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ica2fb7e7fcac112140e5d64f3e4193222c974352
 2020-03-26 19:48:51 +08:00
Bonian Chen
56b3b877b2 Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: f63423f5da am: 6dcef8a4c1 
Change-Id: I6f963850a9e59e7eb6341c882e1d2e7438df8802
 2020-03-26 10:41:32 +00:00
Automerger Merge Worker
987441d843 Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe" into rvc-d1-dev-plus-aosp am: 6217097f81 am: 3773751627 
Change-Id: If7607352a3d7441d357e8fc6b457f1546c16bd04
 2020-03-26 10:41:03 +00:00
Menghan Li
8242c7da1b Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: b8d0e246ca am: 20d2291582 
Change-Id: I3debee9ffcc63e197b0b564df9aac31d584e160a
 2020-03-26 10:40:36 +00:00
Alex Johnston
74260a733f Retain FRP data when FR is invoked in Settings 
* If the device is an organization-owned managed
  profile device and a FRP policy is set, the
  factory reset protection data is no longer
  erased from factory reset in Settings.

Bug: 148847767
Test: manual testing
Change-Id: Iebaf2446f23626b24db37f5173dc77f9dee25ba9
 2020-03-26 10:29:52 +00:00
Treehugger Robot
533c10f747 Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 
Change-Id: I3ab6b4458babf1bfd43c89fb74ae451cf05f9022
 2020-03-26 10:25:32 +00:00
Treehugger Robot
1ed4e81385 Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" 2020-03-26 10:07:30 +00:00