Automerger Merge Worker
17ec2206f3
Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp
2020-03-27 00:58:34 +00:00
Xiangyu/Malcolm Chen
a99132ab3a
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531
...
Change-Id: Iaaf9a087b05d493b1b53a219d9cab9ca6398998c
2020-03-27 00:58:27 +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
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
Xiangyu/Malcolm Chen
0358e150fb
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08
...
Change-Id: Ib32c94a0f464aa0f95a73611b833664313c48b16
2020-03-27 00:44:04 +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
a93ba8895e
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 908fff9099
...
Change-Id: I2cf85a16e67b131c5383283dcff291a74d80f9d8
2020-03-26 21:18:34 +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
300b3742fd
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
...
Change-Id: If875b3ad36863daff5e408a142caade2b44a3f18
2020-03-26 21:06:31 +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
Automerger Merge Worker
ea7b3d94a8
Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp
2020-03-26 15:28:58 +00:00
TreeHugger Robot
3421f934c8
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1
...
Change-Id: Ie02d655b3334da8e169a017f638f3c38bba034a3
2020-03-26 15:28:47 +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
a3368c723d
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c
...
Change-Id: I7fd91faca77022aa748fbfbc41a645260f31aedf
2020-03-26 15:05:35 +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
Automerger Merge Worker
04be843ab3
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp
2020-03-26 13:39:05 +00:00
Alex Johnston
ff02f246c9
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45
...
Change-Id: I7ad8727e62802411caea66fab8e81decd6878abb
2020-03-26 13:39:00 +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
bbd65ff983
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
...
Change-Id: I259abdec68097485aa875e802a3e39b6098fba9c
2020-03-26 13:19:57 +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
TreeHugger Robot
52c1c77d93
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 6b754f1582
...
Change-Id: I99769d190e98a66a89c6716191384e4ae0fb4a6e
2020-03-26 12:13:27 +00:00
TreeHugger Robot
c228661d69
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2
...
Change-Id: Ieb74e58728260f1b4e0a0d064e4d2e6062cd6c52
2020-03-26 12:13:17 +00:00
TreeHugger Robot
6b754f1582
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
...
Change-Id: Iab2416e3b76b379674fc9e834a192ecf42521f0d
2020-03-26 12:01:04 +00:00
TreeHugger Robot
706a7f19c2
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
...
Change-Id: I42908a919e7d1e5cf3730a3be9ed5005f3dc29a8
2020-03-26 12:00:53 +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
TreeHugger Robot
cb90ffafbb
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev
2020-03-26 11:47:07 +00:00
Treehugger Robot
4f6b63056c
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 -s ours am: 818a2050f5 -s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
2020-03-26 10:55:21 +00:00
Treehugger Robot
818a2050f5
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 -s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
2020-03-26 10:41:05 +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
Bonian Chen
6e7dcb8d97
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: e8bfc75f22
...
Change-Id: If9a3e39059d46f75d422e98799177c786513e1da
2020-03-26 09:59:29 +00:00
Jason Chiu
321061ca3f
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 5299084eb6
...
Change-Id: I5984c063934b324c9096c9774ff333b8000acc74
2020-03-26 09:59:21 +00:00
Bonian Chen
f63423f5da
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd
...
Change-Id: I5d88ede47c721d2db2521477631ee87ec02922c5
2020-03-26 09:59:10 +00:00
Automerger Merge Worker
7fed1961e4
Merge "Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 573a22387b" into rvc-d1-dev-plus-aosp
2020-03-26 09:59:08 +00:00
Automerger Merge Worker
6217097f81
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
2020-03-26 09:59:07 +00:00
Alex Johnston
6fd8b1ee7b
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 573a22387b
...
Change-Id: Ie1c74100280e00a7926d963ed84aef8349e70d06
2020-03-26 09:59:04 +00:00
Jason Chiu
436fd363a2
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe
...
Change-Id: Id7aeee1a04db2574632d676bcbba972734ca4cb2
2020-03-26 09:59:00 +00:00
Automerger Merge Worker
e3d76788f7
Merge "Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21" into rvc-d1-dev-plus-aosp
2020-03-26 09:58:59 +00:00
Menghan Li
1c33b0298e
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21
...
Change-Id: Ia26e16bbe00299699a71ad1a7876205f743d8313
2020-03-26 09:58:57 +00:00
Alex Johnston
f44f0fba0e
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741
...
Change-Id: If4b06927cdf811b370ed50159578c1c243339042
2020-03-26 09:58:53 +00:00
Menghan Li
b8d0e246ca
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6
...
Change-Id: If08f487a59f18220deedbb2b6433e9580c444850
2020-03-26 09:58:43 +00:00
Bonian Chen
e8bfc75f22
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
...
Change-Id: Ie50623f8d49b5acd37b872f65033f34376125a69
2020-03-26 09:53:59 +00:00
Jason Chiu
5299084eb6
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
...
Change-Id: I4b61b4e0ff2f1bbc4bc99597e099cf254f16cb88
2020-03-26 09:53:51 +00:00
Bonian Chen
ada7e519fd
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
...
Change-Id: Ibb1ccf9625f7aa7d644bd5f4071068af007507ec
2020-03-26 09:53:41 +00:00
