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
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
Salvador Martinez
d2a4dfb27d
Merge "Update Battery Saver schedule to add order to seekbar" into qt-dev am: d8accd6b6a
...
am: 3ea00c941d
Change-Id: Ie9660573e53831b8c4cbf311a3b9e5245ff6b25e
2019-05-04 02:12:08 -07:00
Julia Reynolds
07245ab3d0
Merge " Make the selected importance more prominent" into qt-dev am: d4d240f313
...
am: ca10114750
Change-Id: I6989e2a992fe037348183ea1f62aaa461b55af73
2019-05-03 23:38:49 -07:00
Andrew Sapperstein
178d76b4bd
Mark broken tests @Ignore. am: 7af5a9e0c3
...
am: 66704ecd9b
Change-Id: I46fc6e3b066ed77c420622f33c7fd617b76211a6
2019-05-03 23:33:24 -07:00
Amin Shaikh
24b41f52d3
Merge "Fix themed settings icons." into qt-dev am: 1c3d7aa1f9
...
am: 4f0d017808
Change-Id: I0d52c9cce9724e64621f919215402639f2323a9e
2019-05-03 23:22:01 -07:00
Jason Chiu
5ab07ffbc3
Merge "Update the deprecated Slice APIs to the new ones" into qt-dev am: 6aab54e4be
...
am: 13efb72d0d
Change-Id: I5b8b27332df966321a7eb786c6b8c207ff0ed02c
2019-05-03 23:08:49 -07:00
Beth Thibodeau
6007065213
Merge "Add setting suggestion for style" into qt-dev am: 1d1f1b321e
...
am: 2c773e578e
Change-Id: Ieba65805d03fe3aca3151b4325a21061bb107c4f
2019-05-03 22:08:33 -07:00
Salvador Martinez
3ea00c941d
Merge "Update Battery Saver schedule to add order to seekbar" into qt-dev
...
am: d8accd6b6a
Change-Id: I599bfedf28bd935987eebc64295fb5e36021b613
2019-05-03 20:05:30 -07:00
Julia Reynolds
11a28e4d70
Update colors am: fc5f111bb9
...
am: dc82f8e707
Change-Id: I690cb2b39e5e3b9b5f5313304d5add015ad0f9b0
2019-05-03 19:22:53 -07:00
Kevin Chyn
b033e4ca52
Merge "Update face settings to match mocks" into qt-dev am: 27e0c844ae
...
am: aa39e6a778
Change-Id: I93f166adb6f9a50bc968255ffb3e541424e4b256
2019-05-03 19:22:09 -07:00
Andrew Sapperstein
75b61326e6
Merge "Add metrics categories for delete sims dialogs." into qt-dev am: 920723019e
...
am: c99572e2f2
Change-Id: Iaa7ce928ae1f27aaf2055c36906e09c9873efd55
2019-05-03 19:21:23 -07:00
Lei Yu
991c51cb6b
Merge "Update title for metered preference" into qt-dev am: 6e55084e19
...
am: 18952e522d
Change-Id: Ie2d85c66e781aa6a07532cc8cc3aab2e39540daf
2019-05-03 19:20:35 -07:00
Fan Zhang
e00c504758
Merge "Delete dead tests." into qt-dev am: 157f2f095f
...
am: 3252944654
Change-Id: I9aee95e1bb076cb4b4fa6f218510ea3af3e94d26
2019-05-03 19:19:38 -07:00
cosmohsieh
27a26ed44b
Merge "[PasspointV2] Fix lint error" into qt-dev am: 7cddfa8075
...
am: d58b9b10b7
Change-Id: Ibb2d194132fe7019a67ae3046c09848376f2ccef
2019-05-03 19:18:51 -07:00
Andrew Sapperstein
6ccce04326
Merge "Tint plus icon in mobile networks list." into qt-dev am: 8d4654682a
...
am: 78f1f66e1e
Change-Id: I71bc1ed6befd5c3f27dfca3308b8ce244ef883da
2019-05-03 19:18:01 -07:00
Julia Reynolds
ca10114750
Merge " Make the selected importance more prominent" into qt-dev
...
am: d4d240f313
Change-Id: I4c34eccdf43063fb8fb3d0234a0b2b8a922f4a14
2019-05-03 18:25:44 -07:00
Andrew Sapperstein
66704ecd9b
Mark broken tests @Ignore.
...
am: 7af5a9e0c3
Change-Id: I638935d88091bf7a10ed08c22467f0a8d577ffce
2019-05-03 18:13:34 -07:00
Amin Shaikh
4f0d017808
Merge "Fix themed settings icons." into qt-dev
...
am: 1c3d7aa1f9
Change-Id: I79de8a93ff1b912525f760c6269f52f1b8897868
2019-05-03 17:29:13 -07:00
TreeHugger Robot
d8accd6b6a
Merge "Update Battery Saver schedule to add order to seekbar" into qt-dev
2019-05-03 23:56:22 +00:00
Fan Zhang
71d793cc2a
Format app data usage using IEC unit, not SI unit.
...
Fixes: 131924586
Test: visual
Change-Id: Iedbd15fb9c98a5c93089708e40175cbf5572eeda
2019-05-03 16:53:11 -07:00
Felipe Leme
2f5033a05d
Merge "Changed Content Capture title." into qt-dev am: 78b74f434b
...
am: 5ef6ee7301
Change-Id: Icffc3199a91b61261ab16520c8a518ee3c934d01
2019-05-03 16:49:42 -07:00
Salvador Martinez
7c4d2a2de2
Merge "Update battery saver footer to have learn more link" into qt-dev am: a5bc389c9d
...
am: 75c9a817f0
Change-Id: I3073dff6f7e12ce5cb54197b8614c5b8bf743494
2019-05-03 16:19:23 -07:00
Jason Chiu
13efb72d0d
Merge "Update the deprecated Slice APIs to the new ones" into qt-dev
...
am: 6aab54e4be
Change-Id: I9224f11012448f57213bd004f8c598d995825cff
2019-05-03 15:56:56 -07:00
Beth Thibodeau
2c773e578e
Merge "Add setting suggestion for style" into qt-dev
...
am: 1d1f1b321e
Change-Id: Ib7c8225c1887b239faf6a3952ddec383d266389f
2019-05-03 15:53:43 -07:00
Fan Zhang
0d69f08337
Remove animator on app list.
...
The animator causes a lot of jank. Removing it makes the UI feel faster
in general.
Fixes: 74127318
Test: visual
Change-Id: I79cbe8220fb05af84a394207dac2c8c9a93288be
2019-05-03 15:37:55 -07:00
TreeHugger Robot
d4d240f313
Merge " Make the selected importance more prominent" into qt-dev
2019-05-03 22:20:28 +00:00