Commit Graph

52461 Commits

Author SHA1 Message Date
JeiFeng Lee
3d278e7bbd Merge "[PATCH] Buttons in storage settings" into qt-dev am: d88ca05b2e
am: d851d36b8c

Change-Id: I2bd89b97ebd3ece8a482c29fbe9bbb05815bc4ca
2019-05-08 10:51:01 -07:00
Yi-Ling Chuang
ead58c3d6d Merge "Add null check before setting the visibility of swipe background" into qt-dev am: 1079d2833a
am: 9a8717c9c0

Change-Id: I333059bde118000c5f4c775dda32bac52c767dd3
2019-05-08 10:48:29 -07:00
JeiFeng Lee
d851d36b8c Merge "[PATCH] Buttons in storage settings" into qt-dev
am: d88ca05b2e

Change-Id: I79d86c7bc6d29a941dd396ee0ec0ebedaab9602e
2019-05-08 10:16:42 -07:00
Yi-Ling Chuang
9a8717c9c0 Merge "Add null check before setting the visibility of swipe background" into qt-dev
am: 1079d2833a

Change-Id: Ifcba7bc83c390e3cb1a863b11b7d9637c0ba48a2
2019-05-08 10:12:51 -07:00
TreeHugger Robot
d88ca05b2e Merge "[PATCH] Buttons in storage settings" into qt-dev 2019-05-08 16:35:12 +00:00
TreeHugger Robot
1079d2833a Merge "Add null check before setting the visibility of swipe background" into qt-dev 2019-05-08 16:34:32 +00:00
Aran Ink
6e858db304 Merge "Create Settings preference for Global Actions Panel." into qt-dev am: 70313a4600
am: 6bf5b847f6

Change-Id: I9bcc36038553f37efe4925c901d5aeec3d9a84e9
2019-05-08 07:40:11 -07:00
Aran Ink
6bf5b847f6 Merge "Create Settings preference for Global Actions Panel." into qt-dev
am: 70313a4600

Change-Id: Ied8fd12055503411fcb8e33cb40e241668a8d567
2019-05-08 07:35:13 -07:00
Aran Ink
70313a4600 Merge "Create Settings preference for Global Actions Panel." into qt-dev 2019-05-08 14:16:07 +00:00
TreeHugger Robot
5894aa6948 Merge "Misc change about ResetNetworkConfirm" 2019-05-08 08:10:16 +00:00
Christopher Dombroski
acc87f1d3f [automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113 am: 6b34347b4c -s ours am: 484d5f914b -s ours
am: d4e19bf92e -s ours
am skip reason: change_id Ieeb6456854cc3d0faa0e9c407accd94f56a25813 with SHA1 d3864daebd is in history

Change-Id: Id72cf1b85e48d7a6e4ab09b82d5af380ad0906b0
2019-05-07 23:40:39 -07:00
Winson Chung
14a487f821 Merge "Disable settings preferences when the packages do not exist" into qt-dev am: 46b356d37d
am: 0936f8f942

Change-Id: I2a348a91956be4f6cf6c42785cf0894816b6eed9
2019-05-07 23:24:20 -07:00
Christopher Dombroski
d4e19bf92e [automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113 am: 6b34347b4c -s ours
am: 484d5f914b -s ours
am skip reason: change_id Ieeb6456854cc3d0faa0e9c407accd94f56a25813 with SHA1 d3864daebd is in history

Change-Id: If51f6565d116012c675c29b00cb57940fc332591
2019-05-07 22:56:47 -07:00
Christopher Dombroski
484d5f914b [automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113
am: 6b34347b4c -s ours
am skip reason: change_id Ieeb6456854cc3d0faa0e9c407accd94f56a25813 with SHA1 d3864daebd is in history

Change-Id: I79dcfa95d120b6b03c71d426fc3c3efb0bf4e6c0
2019-05-07 22:00:45 -07:00
Winson Chung
0936f8f942 Merge "Disable settings preferences when the packages do not exist" into qt-dev
am: 46b356d37d

Change-Id: I9642829f5d22e4641fa1627e13ae8d3fa48c493c
2019-05-07 21:29:28 -07:00
Fan Zhang
622eb0e021 Merge "Add an interface that returns time spent text for app." into qt-dev am: 6e8c403360
am: 83ff47b4d1

Change-Id: If93403e0b92176a54a982ffc2fbbfa5e42894756
2019-05-07 21:27:37 -07:00
Christopher Dombroski
6b34347b4c Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94
am: 1d163af113

Change-Id: Icdbf3b7a403270384d92a0a9fed1326ca16b232f
2019-05-07 21:15:40 -07:00
Yi-Ling Chuang
0f75eb550e Add null check before setting the visibility of swipe background
Some contextual cards does not allow card dismissal, so they won't have
swipe background declared in the layout file. Add null check to prevent
from NPE.

Fixes: 132209310
Test: robotests & launch Settings
Change-Id: I31f897f445c4901d007c8187fe69aea416b915d1
2019-05-08 12:04:36 +08:00
Winson Chung
46b356d37d Merge "Disable settings preferences when the packages do not exist" into qt-dev 2019-05-08 03:47:09 +00:00
Christopher Dombroski
1d163af113 Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd
am: aebc5bbc94

Change-Id: Ia0b46cf2ff284b149df14451b04e1d2b935e4942
2019-05-07 20:20:44 -07:00
Christopher Dombroski
aebc5bbc94 Treat mode_default as denied for install_unknown_apps
am: 4b78bcd5cd

Change-Id: I09e4fa32947b51a6614012ae3f42062416ca086e
2019-05-07 19:14:43 -07:00
Fan Zhang
83ff47b4d1 Merge "Add an interface that returns time spent text for app." into qt-dev
am: 6e8c403360

Change-Id: I0e015174b752787eecba1be40937de42ebff19f9
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

Change-Id: Ia6389a2a35414b60bf7fcb0f742fef1314438383
2019-05-07 15:17:04 -07:00
Fan Zhang
31486b9195 Merge "Remove animator on app list." into qt-dev am: 576cb8b0df
am: 73d79ef7a1

Change-Id: I094e7123f3b8074d4fe2202a1125f75bb0d0c570
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

Change-Id: Ia7e0f7dc5accacb00b9981bac0b143b41a1984c1
2019-05-07 14:36:31 -07:00
Linda Tseng
92a40b644a Merge "Update SliceViewStyle background color" into qt-dev am: e3cc773f0d
am: a73b95041f

Change-Id: I01e6d1f56032e2f5e0c690da6865e96e72f09dc6
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
Aaron Heuckroth
2659c0f61b Create Settings preference for Global Actions Panel.
Test: Automated tests pass.

Bug: 127295457
Change-Id: I6502d4c8541a3f279fb96d5f050f13890db8f376
2019-05-07 16:27:59 -04:00
Winson Chung
cfd0a66f7b Disable settings preferences when the packages do not exist
Bug: 131273934
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest
Change-Id: I5b12831d0eacbaa9c8b13d7a7b380b8c99f20009
2019-05-07 20:16:05 +00:00
Fan Zhang
73d79ef7a1 Merge "Remove animator on app list." into qt-dev
am: 576cb8b0df

Change-Id: I05c37e7cab441bac6a0d97ea3b0379546c606cf9
2019-05-07 13:12:48 -07:00
Linda Tseng
a73b95041f Merge "Update SliceViewStyle background color" into qt-dev
am: e3cc773f0d

Change-Id: Ic06293093bbee095d110d67cbedf935a35e4618d
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

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
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