PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,845 Commits 1 Branch 0 Tags
be59ae7350b171d01e4b9ffb8db19c41f4ffd2ee
Commit Graph

27152 Commits

Author SHA1 Message Date
Kevin Chang
be59ae7350 Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44 am: d3a6120581 
am: ad5ff19118

Change-Id: Ic321ec1ae0126f2d490a637c110e164bc5b20f2d
 2019-05-16 09:31:38 -07:00
joshmccloskey
dd0c8c22b4 Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3 am: c684e636fc 
am: 6f82bd76a5

Change-Id: Ibf7cf5e49941ab6a3ded713c729417a6b4bb0d61
 2019-05-16 09:30:39 -07:00
Beverly
4ff1bbb172 Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b am: fd589a9980 
am: 23b583f894

Change-Id: I327f0cf829e492b5068d93b905561c986b82a089
 2019-05-16 09:28:49 -07:00
Kevin Chyn
75fdf1dc0c Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 am: a4edd2b9a2 
am: 4310498646

Change-Id: I5540ebd631e4f49a0414c7f85eb4d689d8fe2e41
 2019-05-16 09:27:49 -07:00
Lei Yu
d6ad2a3340 Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370 am: 2d0bf613e7 
am: 0b758293c8

Change-Id: I45669bd49d533e17fa2aaa3c3a41f625bd955668
 2019-05-16 00:50:41 -07:00
Fan Zhang
211a479817 Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13 am: b8cde6da35 
am: 284789c41d

Change-Id: I98aeb638588e2d6964ff3dbd3ccca5a0a2bc86d5
 2019-05-16 00:41:08 -07:00
Kevin Chang
ad5ff19118 Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44 
am: d3a6120581

Change-Id: I9dd092a2cec7018aa7c3257f5e8244eb2ed4a60f
 2019-05-15 23:17:11 -07:00
joshmccloskey
6f82bd76a5 Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3 
am: c684e636fc

Change-Id: I504d4f969f8a2f7df3db28a74069ef03a7d4e834
 2019-05-15 23:11:07 -07:00
Beverly
23b583f894 Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b 
am: fd589a9980

Change-Id: I949e79f8cd95138d36901770c9324d0981149cbd
 2019-05-15 23:04:07 -07:00
Kevin Chyn
4310498646 Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 
am: a4edd2b9a2

Change-Id: I50e01bc3a5169a840db2af3c7e836e1a039a0b52
 2019-05-15 22:51:37 -07:00
Lei Yu
0b758293c8 Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370 
am: 2d0bf613e7

Change-Id: Ib126893499663f636ceb244588dc8e4caf64ae44
 2019-05-15 20:27:20 -07:00
Fan Zhang
284789c41d Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13 
am: b8cde6da35

Change-Id: I6442ceb64367a73097f66edef35137679819b58f
 2019-05-15 20:17:15 -07:00
Kevin Chang
4891ea2d44 Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev 2019-05-16 01:10:11 +00:00
TreeHugger Robot
b195c402f3 Merge "Re enable remove button after cancel" into qt-dev 2019-05-16 00:51:26 +00:00
Kevin Chang
a4a1055d7c Merge "Change string of switchbar and installed service category title" into qt-dev 
am: d0c5f2d443

Change-Id: I48c62d62e2b4902adb800e5b62528b13f56ebccf
 2019-05-15 17:27:22 -07:00
TreeHugger Robot
08ef7bd52b Merge "Always include uid as part of recentApp key" into qt-dev 2019-05-15 22:47:28 +00:00
Kevin Chyn
dbe4384909 Merge "Update enroll to match mocks" into qt-dev 2019-05-15 22:34:40 +00:00
Lei Yu
825ac6e370 Merge "Add empty check for path in UsageGraph" into qt-dev 2019-05-15 22:05:18 +00:00
TreeHugger Robot
0376a3ce13 Merge "Fix preview image alignment issue due to clip padding." into qt-dev 2019-05-15 22:01:06 +00:00
Fan Zhang
db3fca16f7 Fix preview image alignment issue due to clip padding. 
CaptionPropertiesFragment is using a non-standard way to display preview
images. Changed to use LayoutPreference.

Bug: 132797057
Test: visual
Change-Id: I92bfd38e2880226d7385e98ed871dad4e1f30e42
 2019-05-15 13:26:39 -07:00
Kevin Chyn
ceb5aa4514 Update enroll to match mocks 
Test: manual
Fixes: 132803438
Change-Id: I99a10e60833a31b71abf8fdbf7e426e9867a1cf5
 2019-05-15 12:51:13 -07:00
joshmccloskey
77735226a8 Re enable remove button after cancel 
Fixes: 132753128
Test: Manual.
Change-Id: I36ef74455dc8ceca52dfbc8d0e6fbef770b2533d
 2019-05-15 12:44:14 -07:00
Beverly
10d8894686 Always include uid as part of recentApp key 
- so that work apps are also tracked

Test: atest RecentNotifyingAppsPreferenceControllerTest
Fixes: 132183578
Change-Id: Iceb9604674a3525b93c1cdde6e32a3a83b813866
 2019-05-15 14:46:35 -04:00
Lei Yu
7db71f91bf Add empty check for path in UsageGraph 
If path is empty, skip method since there is nothing to draw.

Bug: 132728523
Test: RunSettingsRoboTests
Change-Id: I6fdb7c2f69d3d658c47b58c7304cfeb7d4010a46
 2019-05-15 11:36:15 -07:00
Kevin Chang
556422915d Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443 
am: bfed5d1ca1

Change-Id: Ic897066e6b9989ff68b5e6b3b2cb2f5ffe56cea9
 2019-05-14 20:24:53 -07:00
Salvador Martinez
1e1b7fb99c Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d 
am: db30782bbf

Change-Id: I5d379c04ac030f60fb6dff117adca529661cd9c2
 2019-05-14 19:52:22 -07:00
Kevin Chang
bfed5d1ca1 Merge "Change string of switchbar and installed service category title" into qt-dev 
am: d0c5f2d443

Change-Id: I4e8f59bd9c5d0a9b906b4b0bbc05446dc24156ad
 2019-05-14 19:50:05 -07:00
Kevin Chang
d0c5f2d443 Merge "Change string of switchbar and installed service category title" into qt-dev 2019-05-15 02:13:09 +00:00
Salvador Martinez
db30782bbf Merge "Fix dark theme and battery saver interaction" into qt-dev 
am: ba5964d99d

Change-Id: I83ee0c60e08af8f2166eb3f01a30baa975a86600
 2019-05-14 19:12:12 -07:00
Lei Yu
f84633ec79 Merge "Use NetworkTemplate to query data" into qt-dev am: 6b2030a17a 
am: 6d260e680f

Change-Id: I0be1829d75cee480df6c86d11909e0c8e7fcb082
 2019-05-14 18:47:51 -07:00
Salvador Martinez
ba5964d99d Merge "Fix dark theme and battery saver interaction" into qt-dev 2019-05-15 01:33:08 +00:00
Fan Zhang
ff8a733f63 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7 
am: d32e9b5229

Change-Id: Icf5c8c48bb2ea7375cc03d3cec9d9879b6db7249
 2019-05-14 18:15:28 -07:00
Kevin Chang
5111c50977 Fix no reaction when tapping permission dialog button in shortcut service page 
Bug: 132579785
Test: Visual
Change-Id: If9102228439ce23bdfb925baf6f583bb9d4d550d
 2019-05-15 09:07:22 +08:00
Lei Yu
6d260e680f Merge "Use NetworkTemplate to query data" into qt-dev 
am: 6b2030a17a

Change-Id: Ib3599b9c6c8500be35454de89c882c47c3d20721
 2019-05-14 17:52:06 -07:00
Fan Zhang
d32e9b5229 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev 
am: 17521d0ac7

Change-Id: Id702a72ce6adc1dbb20c4f00c0b16cf1ff5ef603
 2019-05-14 17:41:06 -07:00
Colin Cross
714163a258 Merge "Use if instead of switch for resources" into qt-dev-plus-aosp 
am: 341544f133

Change-Id: I20b2cfca7de66c653ba06aec7c51ba8f40ed22de
 2019-05-14 17:38:49 -07:00
Lei Yu
6b2030a17a Merge "Use NetworkTemplate to query data" into qt-dev 2019-05-15 00:27:23 +00:00
TreeHugger Robot
17521d0ac7 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev 2019-05-15 00:01:30 +00:00
Colin Cross
341544f133 Merge "Use if instead of switch for resources" into qt-dev-plus-aosp 2019-05-14 23:33:25 +00:00
Salvador Martinez
ee5f79edbd Fix dark theme and battery saver interaction 
In settings we weren't properly taking into account battery saver
enabled dark theme. This CL makes it so that when battery saver
on we disable the toggle until battery saver is off since
you can't change dark theme in battery saver. Additionally it
adds a message indicating why the toggle was disabled so the
user doesn't get confused.

Test: robotests
Bug: 131913864
Change-Id: I855e429a666098c837650852d1e1355477afa13d
 2019-05-14 14:08:24 -07:00
Fan Zhang
b4b7725937 Revert "Revert "Make subsettings display edge-to-edge"" 
This reverts commit 9e98b8cf0f.

We have to set clipToPadding false on scrollView to make it extend below
navbar. But the side effect is it stops clipping to padding. So it
overlaps with sibling views. In this case anything pinned on top of
screen (switchbar, pinned header for most UIs, and preview indicator for
font size page).

To fix them:
1. in preview pages, just revert back to clipTo*. Their UI doesn't scroll
   so it they don't need to special clip flag to begin with.
2. For pinned to top headers, we need to change the "z-order" by setting
   elevation and make sure background is not transparent.

Fixes: 132182711
Fixes: 132672399
Test: visually on normal screen, font size scree, wifi main setting UI,
      wifi data usage screen

Reason for revert: Rollforward with fix.

Change-Id: Ib6f7c4167b9a680a336f2a7310d82340094d3aac
 2019-05-14 13:48:12 -07:00
Joshua Mccloskey
54aa65a8dc Merge "Fixed talkback issue" into qt-dev am: b2f19c55b5 
am: bda38381c2

Change-Id: I257eef235d30e6c5615762be3223f4647a376235
 2019-05-14 12:37:17 -07:00
Joshua Mccloskey
bda38381c2 Merge "Fixed talkback issue" into qt-dev 
am: b2f19c55b5

Change-Id: Ib2e2029bbd6da18307e9652a7ac4a08e4320d9c9
 2019-05-14 12:18:22 -07:00
Joshua Mccloskey
b2f19c55b5 Merge "Fixed talkback issue" into qt-dev 2019-05-14 19:09:37 +00:00
Fan Zhang
95959878bb Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev am: 9a51ede665 
am: 7db72f0ef1

Change-Id: Ie400dae74f651ba127a372d5109967f2256f509e
 2019-05-14 11:34:47 -07:00
Fan Zhang
7db72f0ef1 Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev 
am: 9a51ede665

Change-Id: I1c152ddacaf43fa035ebf04159b9cf151cc11292
 2019-05-14 11:10:40 -07:00
Fan Zhang
9a51ede665 Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev 2019-05-14 17:17:26 +00:00
Fan Zhang
9e98b8cf0f Revert "Make subsettings display edge-to-edge" 
This reverts commit c2a85a374d.

Bug: 132672399
Bug: 132182711
Test: n/a

Reason for revert: b/132672399

Change-Id: Icb34ae5b16b7a32215fe2c1a5f0d0d028c91b2ca
 2019-05-14 16:31:08 +00:00
Hai Shalom
094aecb2a1 Merge "[OWE] Support OWE in transition mode" into qt-dev am: ae6f6ab00a 
am: 6f80f0db2a

Change-Id: I9c3c44770475806609b6c95fae46a1f9bbef671b
 2019-05-14 07:27:47 -07:00
Hai Shalom
6f80f0db2a Merge "[OWE] Support OWE in transition mode" into qt-dev 
am: ae6f6ab00a

Change-Id: I2822ec654936266baf57f16108a1bcec830362ba
 2019-05-14 07:11:34 -07:00