Commit Graph

59521 Commits

Author SHA1 Message Date
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
dd350eebab Merge "Add log for manual network select settings" into qt-dev
am: 02a54a0150

Change-Id: I58a1fe90a61a01abbc49f85338eb323d92daae2c
2019-05-06 11:50:23 -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
Yi-Ling Chuang
f03593dc6e Limit the number of permissions being displayed.
am: 922064ed69

Change-Id: I6dbb04a2d105f7b35ce53a29263c52871a6a07a9
2019-05-06 11:16:39 -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
Yi-Ling Chuang
b5a87c9298 Merge "Use PermissionControllerManager to get permission groups" into qt-dev
am: 1dfc43879e

Change-Id: Ided8b0c6c515d8f36c25207e01482449695172bb
2019-05-05 19:55:18 -07:00
TreeHugger Robot
1dfc43879e Merge "Use PermissionControllerManager to get permission groups" into qt-dev 2019-05-06 02:39:13 +00:00
android-build-team Robot
f0a3fb26c5 Snap for 5534160 from a6bebb793e to qt-release
Change-Id: I917e75bb1f99e05f977dc1f8c1eb5eb196d1e575
2019-05-05 23:10:52 +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
96e3206873 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: a6bebb793e -s ours
am skip reason: subject contains skip directive

Change-Id: If2b9480c688efbe66706a513d3325f7e5ea914a3
2019-05-04 23:58:16 -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
android-build-team Robot
ac760cd8bf Snap for 5533229 from 21dbfce634 to qt-release
Change-Id: Ic0c62fefa8b4ffcf7f37b740143e0e1811d9be81
2019-05-04 23:14:23 +00: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
25189ef45e Merge "Gentle notifications screen" into qt-dev
am: 21dbfce634

Change-Id: I1d1ddef571eabb0223f81e84ae88803fe47eddd7
2019-05-04 13:30:53 -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
Julia Reynolds
5a212c4be9 Merge "Populate recent notifying apps from usage events" into qt-dev
am: 4a7a1086d0

Change-Id: I1410272ee4f249d202ade13fd98f7f69ae04e712
2019-05-04 07:41:15 -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
Fan Zhang
cf50332c6e Merge "Format app data usage using IEC unit, not SI unit." into qt-dev
am: 805ba40194

Change-Id: I612cca8198de289451f90f9615efdd7223f6376d
2019-05-04 03:33:15 -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
Salvador Martinez
f8dfa31b15 Merge "Update Battery Saver schedule to add order to seekbar" into qt-dev
am: d8accd6b6a

Change-Id: I6c1a9ecf1b9479e1a6175cbee128f2751f611677
2019-05-03 22:33:03 -07:00
Julia Reynolds
a58cccb6bc Merge " Make the selected importance more prominent" into qt-dev
am: d4d240f313

Change-Id: I6f01e71e7c2e0d1d164ceca0a2633fa8bf713d53
2019-05-03 22:17:25 -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
Andrew Sapperstein
b4ce883309 Mark broken tests @Ignore.
am: 7af5a9e0c3

Change-Id: I1b3ff016da066fcf66fe7f4dfdb6230e6c0aed86
2019-05-03 22:07:23 -07:00
Amin Shaikh
93e9a335bd Merge "Fix themed settings icons." into qt-dev
am: 1c3d7aa1f9

Change-Id: I6617c1ddc903ef127d3c7ad2cf580dbb925a6ea7
2019-05-03 21:23:49 -07:00
Jason Chiu
1c4cebdf2c Merge "Update the deprecated Slice APIs to the new ones" into qt-dev
am: 6aab54e4be

Change-Id: I262ea4f90f000df212dc2fafc682334321ffb84a
2019-05-03 20:57:05 -07:00
Beth Thibodeau
5a8b172948 Merge "Add setting suggestion for style" into qt-dev
am: 1d1f1b321e

Change-Id: Id49ac16328555b8f056a7854312777441669010c
2019-05-03 20:41:24 -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