Fan Zhang
622eb0e021
Merge "Add an interface that returns time spent text for app." into qt-dev am: 6e8c403360
...
am: 83ff47b4d1
2019-05-07 21:27:37 -07:00
Fan Zhang
83ff47b4d1
Merge "Add an interface that returns time spent text for app." into qt-dev
...
am: 6e8c403360
2019-05-07 18:22:13 -07:00
TreeHugger Robot
6e8c403360
Merge "Add an interface that returns time spent text for app." into qt-dev
2019-05-08 00:11:32 +00:00
Daniel Solomon
8a38791509
Merge "Hide display white balance setting depending on accessibility" into qt-dev am: 11b68bc420
...
am: b907794aa3
2019-05-07 15:17:04 -07:00
Fan Zhang
31486b9195
Merge "Remove animator on app list." into qt-dev am: 576cb8b0df
...
am: 73d79ef7a1
2019-05-07 14:59:18 -07:00
Daniel Solomon
b907794aa3
Merge "Hide display white balance setting depending on accessibility" into qt-dev
...
am: 11b68bc420
2019-05-07 14:36:31 -07:00
Linda Tseng
92a40b644a
Merge "Update SliceViewStyle background color" into qt-dev am: e3cc773f0d
...
am: a73b95041f
2019-05-07 14:24:23 -07:00
Daniel Solomon
11b68bc420
Merge "Hide display white balance setting depending on accessibility" into qt-dev
2019-05-07 21:19:36 +00:00
Fan Zhang
73d79ef7a1
Merge "Remove animator on app list." into qt-dev
...
am: 576cb8b0df
2019-05-07 13:12:48 -07:00
Linda Tseng
a73b95041f
Merge "Update SliceViewStyle background color" into qt-dev
...
am: e3cc773f0d
2019-05-07 12:56:20 -07:00
Fan Zhang
576cb8b0df
Merge "Remove animator on app list." into qt-dev
2019-05-07 19:05:39 +00:00
Linda Tseng
e3cc773f0d
Merge "Update SliceViewStyle background color" into qt-dev
2019-05-07 18:55:31 +00:00
Yi-Ling Chuang
d26db3793f
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev am: 9fcb35a009
...
am: 922ecb6628
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
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
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
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
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
Kevin Chang
e7a1f1a668
Merge "Change the attributes of SwitchBar and ToggleSwitch" into qt-dev am: caa17e0ec7
...
am: c64b99b1e7
2019-05-07 02:03:21 -07:00
Kevin Chang
c64b99b1e7
Merge "Change the attributes of SwitchBar and ToggleSwitch" into qt-dev
...
am: caa17e0ec7
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
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
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: 0d894197f63aeb915355
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
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: c5b6fda98c23c53ad504
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
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
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
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
Yanting Yang
4841bb6905
Merge "Clean up import in homepage" into qt-dev am: 65a258e2a2
...
am: de9c1f8e53
2019-05-06 14:12:25 -07:00
Yanting Yang
de9c1f8e53
Merge "Clean up import in homepage" into qt-dev
...
am: 65a258e2a2
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
2019-05-06 13:14:04 -07:00
Julia Reynolds
7aa2a4a19c
Merge "New NIM animation" into qt-dev
...
am: 214fc759af
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
2019-05-06 12:12:00 -07:00
Pengquan Meng
3dc8887a51
Merge "Add log for manual network select settings" into qt-dev
...
am: 02a54a0150
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
2019-05-06 10:44:55 -07:00
Yi-Ling Chuang
6e167068fb
Limit the number of permissions being displayed.
...
am: 922064ed69
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
2019-05-05 19:59:17 -07:00
