Edgar Wang
133ffc9c57
Show admin dialog when preference is disabled by Device Admin
...
Fixes: 130694312
Test: manual & robotest
Change-Id: I9c6487ac056ec3d784bd6f6901e96869e27e0b3e
2019-05-08 02:04:05 +08:00
Yi-Ling Chuang
d26db3793f
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev am: 9fcb35a009
...
am: 922ecb6628
Change-Id: Ie3af39287ecdd7d60749ddb883f686d04853301a
2019-05-07 08:58:28 -07:00
Yi-Ling Chuang
922ecb6628
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev
...
am: 9fcb35a009
Change-Id: I47970b4ad73a3eb22367c0151c671d1c6016ee4d
2019-05-07 08:47:48 -07:00
TreeHugger Robot
9fcb35a009
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev
2019-05-07 15:34:24 +00:00
Bram Bonné
d284430132
Merge "Adapts P2P settings to work with with new MAC privacy restrictions." into qt-dev am: db6a70272e
...
am: c94db6ca56
Change-Id: Ic3c4ce74c5c0116ec6668aad98818162fce5023c
2019-05-07 07:31:29 -07:00
Bram Bonné
c94db6ca56
Merge "Adapts P2P settings to work with with new MAC privacy restrictions." into qt-dev
...
am: db6a70272e
Change-Id: Id2b14493fbcf3251bf058ce377331ff4b7de7164
2019-05-07 07:11:24 -07:00
Bram Bonné
db6a70272e
Merge "Adapts P2P settings to work with with new MAC privacy restrictions." into qt-dev
2019-05-07 14:02:04 +00:00
Arc Wang
ac75faa207
Fix back arrow in wifi settings "connect to this network connection qr code" does not work
...
When clicking back button, pop fragment and Finish the activity if there is nothing to pop
Bug: 132132756
Test: atest WifiDppConfiguratorActivityTest
Change-Id: Ia16951e79e578f1625e5fadd26553735fa90bffa
2019-05-07 18:06:54 +08:00
Yi-Ling Chuang
ce9903e8db
Hide dismissal swipe background before slice gets ready
...
Only make swipe background visible once slice has a successfual binding.
Bug: 131843256
Test: robotests
Change-Id: I7866873a217e8ca882634a48108939022713c87b
2019-05-07 17:54:33 +08:00
Raff Tsai
a5b25dfb06
Misc change about ResetNetworkConfirm
...
- Modify reset network layout
- Merge changes from Qt-dev
Fixes:131127455
Test: manual
Change-Id: I6d63a821016588ea81a04ef792111c2b96dfe7fe
2019-05-07 09:31:15 +00:00
Kevin Chang
e7a1f1a668
Merge "Change the attributes of SwitchBar and ToggleSwitch" into qt-dev am: caa17e0ec7
...
am: c64b99b1e7
Change-Id: I686f13ef739576f290b9ac8b720559be43072cd4
2019-05-07 02:03:21 -07:00
Kevin Chang
c64b99b1e7
Merge "Change the attributes of SwitchBar and ToggleSwitch" into qt-dev
...
am: caa17e0ec7
Change-Id: Ieb3af48fd330a9beae914caff8e00fab361e554d
2019-05-07 01:58:22 -07:00
Kevin Chang
caa17e0ec7
Merge "Change the attributes of SwitchBar and ToggleSwitch" into qt-dev
2019-05-07 08:53:28 +00:00
Stanley Wang
f777940ead
Merge "Fix no touch feedback present on the settings suggestion card." into qt-dev am: 87d9626a78
...
am: 5e9094c0f3
Change-Id: I47a8f4dfac6ff8a56ed9b6da922e53d660b0b011
2019-05-07 01:08:09 -07:00
Stanley Wang
5e9094c0f3
Merge "Fix no touch feedback present on the settings suggestion card." into qt-dev
...
am: 87d9626a78
Change-Id: I3c99d8707347037d904bb6f1feb7c0148dbd8cb4
2019-05-07 00:56:51 -07:00
Stanley Wang
87d9626a78
Merge "Fix no touch feedback present on the settings suggestion card." into qt-dev
2019-05-07 07:45:31 +00:00
Raff Tsai
85b09c94b4
[automerger skipped] Merge "ANR observed under settings when trying to reset network settings" into qt-dev am: d6d5495aa1
...
am: 0d894197f6
-s ours
am skip reason: change_id I59345f48ed840ecfd64c29c2c20ab8caf2679f63 with SHA1 3aeb915355
is in history
Change-Id: Ied6a7ecbd4387cbf3ead1675df2fd1995e28b23f
2019-05-06 21:55:26 -07:00
Raff Tsai
0d894197f6
Merge "ANR observed under settings when trying to reset network settings" into qt-dev
...
am: d6d5495aa1
Change-Id: I8ee5162f44c834cb74ceeff14f604e480b123e9a
2019-05-06 21:50:30 -07:00
Raff Tsai
d6d5495aa1
Merge "ANR observed under settings when trying to reset network settings" into qt-dev
2019-05-07 04:40:34 +00:00
Kevin Chang
d816060fd6
[automerger skipped] Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev am: 4b7d48320c
...
am: c5b6fda98c
-s ours
am skip reason: change_id I4bcde9c52b4ed3484727e79758ef37f4b05a209d with SHA1 23c53ad504
is in history
Change-Id: Icb930088f758049f25618555864c7f6503a22796
2019-05-06 21:16:22 -07:00
Kevin Chang
c5b6fda98c
Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev
...
am: 4b7d48320c
Change-Id: I03e100ccfc9373e61d933ce948a49237f0e2fadc
2019-05-06 21:11:22 -07:00
Kevin Chang
4b7d48320c
Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev
2019-05-07 03:47:51 +00:00
Jason Chiu
1dafe9864e
Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev am: a892ed5cdd
...
am: 3b1bdd5726
Change-Id: I1443fadd11ce48628466e4c9e4918204800d0c84
2019-05-06 20:44:44 -07:00
Jason Chiu
3b1bdd5726
Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev
...
am: a892ed5cdd
Change-Id: I097d25d222176fa2bab51603e1cfe6a26a8bc47a
2019-05-06 19:58:51 -07:00
Kevin Chang
e718cfcd94
Change the attributes of SwitchBar and ToggleSwitch
...
Change the focusable and clickable of SwitchBar and ToggleSwitch
to avoid multiple focus with TalkBack
Bug: 124334500
Bug: 128475156
Test: Visual
Change-Id: I13003f4e17d4c76644f87095c140f005b38889af
2019-05-07 10:56:39 +08:00
TreeHugger Robot
a892ed5cdd
Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev
2019-05-07 02:45:19 +00:00
lindatseng
8afc10b3df
Update SliceViewStyle background color
...
Update android:background color in SliceViewStle to make it have correct
color when Panel is in dark mode. Use the attr which will change
depends on theme, rather than contextual card background which is
defined by settings, to make it correct in more general case.
Fixes: 131927006
Test: Manual
Change-Id: I38733f5a53d38f70f925268efea7592bd0f48260
2019-05-06 19:05:14 -07:00
JeiFeng Lee
7bc5f91289
[PATCH] Buttons in storage settings
...
Due to changes in layout of storage wizard base,
2 extra buttons are shown on progress screen while formatting SD card
and also on other screens which have storage wizard base as their super class.
Hence when these buttons were clicked unsupported exception takes place.
Hide these unnecessary next/back buttons from all screen so that user cannot click these.
Fixes: 131779469
Test: manual
Change-Id: I235a180627e68bbb38f4ed4e7ac58ae38838c8d7
Signed-off-by: JeiFeng Lee <linger.lee@mediatek.com >
2019-05-07 09:14:40 +08:00
Yanting Yang
4841bb6905
Merge "Clean up import in homepage" into qt-dev am: 65a258e2a2
...
am: de9c1f8e53
Change-Id: I1180b7f0a684ab9ea54ddbae6d78ca0a5f5531df
2019-05-06 14:12:25 -07:00
Yanting Yang
de9c1f8e53
Merge "Clean up import in homepage" into qt-dev
...
am: 65a258e2a2
Change-Id: I5e9a8fb0b5a99a59db2ae1a2f7b2c1eb21bb7235
2019-05-06 14:02:02 -07:00
TreeHugger Robot
65a258e2a2
Merge "Clean up import in homepage" into qt-dev
2019-05-06 20:28:37 +00:00
Julia Reynolds
dfd9002330
Merge "New NIM animation" into qt-dev am: 214fc759af
...
am: 7aa2a4a19c
Change-Id: I774f098918b18fc260a73559f814ed097c02c45c
2019-05-06 13:14:04 -07:00
Julia Reynolds
7aa2a4a19c
Merge "New NIM animation" into qt-dev
...
am: 214fc759af
Change-Id: Ibcfcf3315c8592a1dd660736e1dc6bb5b3a59882
2019-05-06 12:55:01 -07:00
TreeHugger Robot
214fc759af
Merge "New NIM animation" into qt-dev
2019-05-06 19:33:36 +00:00
Pengquan Meng
2e2bf7105a
Merge "Add log for manual network select settings" into qt-dev am: 02a54a0150
...
am: 3dc8887a51
Change-Id: I463a6f6d860ebd756d313526c26759d046c6faf7
2019-05-06 12:12:00 -07:00
Pengquan Meng
3dc8887a51
Merge "Add log for manual network select settings" into qt-dev
...
am: 02a54a0150
Change-Id: I76a9139c5598fb07846dd3f9a3d80e2c992cec0e
2019-05-06 11:41:40 -07:00
Pengquan Meng
02a54a0150
Merge "Add log for manual network select settings" into qt-dev
2019-05-06 18:15:02 +00:00
Yi-Ling Chuang
27c257b63a
Limit the number of permissions being displayed. am: 922064ed69
...
am: 6e167068fb
Change-Id: I0fada80d47402a90e01a4963a1bc8923408fe736
2019-05-06 10:44:55 -07:00
Yi-Ling Chuang
6e167068fb
Limit the number of permissions being displayed.
...
am: 922064ed69
Change-Id: I55fcc111d5d67e0e67c327894abb7fa9150c5346
2019-05-06 10:27:32 -07:00
Bram Bonné
5d8d2fa5a8
Adapts P2P settings to work with with new MAC privacy restrictions.
...
With change ag/7340724, the device's P2P MAC adress will no longer be
included as part of the WIFI_P2P_THIS_DEVICE_CHANGED_ACTION broadcast.
This change makes WifiP2pSettings request the device info after
receiving that broadcast, to make it aware of the device's MAC.
Bug: 132055766
Test: atest
/media/sdb1/android/packages/apps/Settings/tests/robotests/src/com/android/settings/wifi/p2p/
Test: Open Wi-Fi Direct settings, clear device name, observe that the
device's MAC is displayed.
Change-Id: I524afb0c8061c90cd775af422b542213cf14640a
2019-05-06 14:29:44 +00:00
tmfang
b031388999
Fix WebViewAppPickerTest
...
- Also do some minor refactoring
Test: robotest
Fixes: 131921277
Change-Id: I8de2e1b9b384ef9722bbe95111b86193fddb83d5
2019-05-06 15:25:53 +08:00
Yi-Ling Chuang
922064ed69
Limit the number of permissions being displayed.
...
To avoid a long permission summary, let's limit the number to three.
Fixes: 117978938
Test: robotests
Change-Id: Id83fac7ad91140b22757d3e6e8eb72d86ad6ad42
2019-05-06 14:12:00 +08:00
Yi-Ling Chuang
1e389acc47
Merge "Use PermissionControllerManager to get permission groups" into qt-dev am: 1dfc43879e
...
am: fa2074562f
Change-Id: I5b9a242da167d368eae3e1039c4c7d70d8788e50
2019-05-05 19:59:17 -07:00
Yi-Ling Chuang
fa2074562f
Merge "Use PermissionControllerManager to get permission groups" into qt-dev
...
am: 1dfc43879e
Change-Id: I549648a29b886fa353d9bc5f0935aa26880f5940
2019-05-05 19:55:19 -07:00
TreeHugger Robot
1dfc43879e
Merge "Use PermissionControllerManager to get permission groups" into qt-dev
2019-05-06 02:39:13 +00:00
Bill Yi
219019c10a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a6bebb793e
-s ours
...
am: 5e30f0c5be
-s ours
am skip reason: subject contains skip directive
Change-Id: I3a6675c222065d2a28107782e9eb2d2132f2ee30
2019-05-05 00:05:39 -07:00
Bill Yi
5e30f0c5be
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: a6bebb793e
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibd129fbc0c46c3262041a80fc62c0082909834c7
2019-05-04 23:58:12 -07:00
TreeHugger Robot
a6bebb793e
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-05 06:45:30 +00:00
Bill Yi
8d4b8a05c1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I83ccb7a7e4790d44a1853ea67da9fb43cb84af78
2019-05-04 21:38:56 -07:00
Julia Reynolds
448852d943
Merge "Gentle notifications screen" into qt-dev am: 21dbfce634
...
am: dab05c6169
Change-Id: I2f2dde1e2d87b899cf5dd44411ae17c861b5ccf6
2019-05-04 13:39:53 -07:00