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
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
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
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
Julia Reynolds
dab05c6169
Merge "Gentle notifications screen" into qt-dev
...
am: 21dbfce634
Change-Id: Ia9544235000388615571f5c9f44263b0cd539b88
2019-05-04 13:30:54 -07:00
Julia Reynolds
21dbfce634
Merge "Gentle notifications screen" into qt-dev
2019-05-04 20:02:39 +00:00
Julia Reynolds
525166f20c
New NIM animation
...
Test: make
Fixes: 123899489
Change-Id: I8e28d304b17cf5441bd9626924fa1450084062e8
2019-05-04 11:03:33 -04:00
Julia Reynolds
643eb7572f
Gentle notifications screen
...
With lockscreen and status bar settings
Test: robo tests
Bug: 128445911
Change-Id: I46c5943d4d8dc1ee74b5b920239f259f5880a2d3
2019-05-04 14:59:53 +00:00
Julia Reynolds
551bc81d0c
Merge "Populate recent notifying apps from usage events" into qt-dev am: 4a7a1086d0
...
am: e1f8525853
Change-Id: I75f76273b87f2573031fd80d4dd71ed64a633096
2019-05-04 07:50:43 -07:00
Julia Reynolds
e1f8525853
Merge "Populate recent notifying apps from usage events" into qt-dev
...
am: 4a7a1086d0
Change-Id: If0c2d93b616c62a9ed49d41f69d7e0a5a5ea34a6
2019-05-04 07:41:18 -07:00
TreeHugger Robot
4a7a1086d0
Merge "Populate recent notifying apps from usage events" into qt-dev
2019-05-04 14:30:29 +00:00
Fan Zhang
8a17654a19
Merge "Format app data usage using IEC unit, not SI unit." into qt-dev am: 805ba40194
...
am: 301e0ec462
Change-Id: Idd3a90b808b6516a3754cff8048e6e2a44c3b9eb
2019-05-04 03:43:14 -07:00
Fan Zhang
301e0ec462
Merge "Format app data usage using IEC unit, not SI unit." into qt-dev
...
am: 805ba40194
Change-Id: Icf637e54bcd598805dea60a7d4a72af8c49bb045
2019-05-04 03:33:16 -07:00
TreeHugger Robot
805ba40194
Merge "Format app data usage using IEC unit, not SI unit." into qt-dev
2019-05-04 10:25:26 +00:00