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

52318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joshmccloskey
ecb58423a3 Merge "Re enable remove button after cancel" into qt-dev 
am: b195c402f3

Change-Id: I5e93ad399778971bdc22112982184db562306c66
 2019-05-15 18:58:57 -07:00
Android Build Merger (Role)
90ecaab8f8 Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp 2019-05-16 01:07:57 +00:00
TreeHugger Robot
b195c402f3 Merge "Re enable remove button after cancel" into qt-dev 2019-05-16 00:51:26 +00:00
Xin Li
f8a2db708b [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master 
am: e6eeb7bd55 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib2112047ef62fa9e995a97bcf0a0e19f61cdea76
 2019-05-15 17:38:54 -07:00
Beverly
52fa75463b Merge "Always include uid as part of recentApp key" into qt-dev 
am: 08ef7bd52b

Change-Id: I2f30889666946880c3331b1727ce7b8e0de5658d
 2019-05-15 17:32:04 -07:00
Kevin Chyn
e70836257c Merge "Update enroll to match mocks" into qt-dev 
am: dbe4384909

Change-Id: I8c561725aa3cac2d4d6fd624c8f7be57faa9036f
 2019-05-15 17:27:51 -07:00
Lei Yu
c48d4d2f28 Merge "Add empty check for path in UsageGraph" into qt-dev 
am: 825ac6e370

Change-Id: Ic29926ea84ec4be6f2200eaa34103c618a65727e
 2019-05-15 16:51:42 -07:00
Fan Zhang
2fef4914b2 Merge "Fix preview image alignment issue due to clip padding." into qt-dev 
am: 0376a3ce13

Change-Id: I39f1a49aaaf698358fca54e69fb6beb65d452a22
 2019-05-15 16:41:39 -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
Mehdi Alizadeh
a4803f3634 Merge "Replace system navigation animations will smaller files" into qt-dev 
am: b9cb4ab062

Change-Id: If9f5e6e3023224af6592f6bff91f3838e7ee3ca1
 2019-05-15 15:31:05 -07: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
TreeHugger Robot
b9cb4ab062 Merge "Replace system navigation animations will smaller files" into qt-dev 2019-05-15 21:17:13 +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
Mehdi Alizadeh
001fb53530 Replace system navigation animations will smaller files 
Bug: 130915285
Test: Manual test
Change-Id: I902177c5f5c0d56f463fbc4e9532c70581fe9154
 2019-05-15 11:05:12 -07:00
Sorin Dinu
bfb45b6177 Merge "Added icons for partial system update card in the Security category" into qt-dev 
am: 2e26605065

Change-Id: I64cd2ebce05b77718b0ba8aa3cd6f7c69c1d0768
 2019-05-14 23:53:19 -07:00
Sorin Dinu
2e26605065 Merge "Added icons for partial system update card in the Security category" into qt-dev 2019-05-15 06:31:49 +00: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
Salvador Martinez
ba5964d99d Merge "Fix dark theme and battery saver interaction" into qt-dev 2019-05-15 01:33:08 +00: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
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
a7125ade35 Merge "Convert Settings to Android.bp" into qt-dev-plus-aosp 2019-05-14 23:33:31 +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
1e84e431d8 Merge "Increased char limit for translations" into qt-dev 
am: 5513a9bdd1

Change-Id: I4ccf9f83431c4a450d05b9118bb8d35cd6f08328
 2019-05-14 12:23:21 -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
5513a9bdd1 Merge "Increased char limit for translations" into qt-dev 2019-05-14 19:13:11 +00:00
Joshua Mccloskey
b2f19c55b5 Merge "Fixed talkback issue" into qt-dev 2019-05-14 19:09:37 +00: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
Xin Li
e6eeb7bd55 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master 
Bug: 132622481
Change-Id: I812914052b50070b44ac2e2ba573a7146b6cbb78
 2019-05-14 10:08:40 -07: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
6f80f0db2a Merge "[OWE] Support OWE in transition mode" into qt-dev 
am: ae6f6ab00a

Change-Id: I2822ec654936266baf57f16108a1bcec830362ba
 2019-05-14 07:11:34 -07:00
TreeHugger Robot
ae6f6ab00a Merge "[OWE] Support OWE in transition mode" into qt-dev 2019-05-14 13:57:05 +00:00
Sorin Dinu
ccf895aac0 Added icons for partial system update card in the Security category 
Bug: b/132288646
Test: make RunSettingsRoboTests
Change-Id: I7f053b54d9b7e15a81f0f02895ee3266a613477e
 2019-05-14 12:25:32 +01:00
Cn Chen
b5b3699f4c Merge "Font size page support light theme in deferred setup" into qt-dev 
am: 421a05a6a9

Change-Id: I3646918b1c52d2962ef736699c2198be0f42613f
 2019-05-14 00:32:35 -07:00
Cn Chen
421a05a6a9 Merge "Font size page support light theme in deferred setup" into qt-dev 2019-05-14 07:18:03 +00:00
cnchen
3eee5cf02e Font size page support light theme in deferred setup 
Bug:124470158
Test: atest & manually test
Change-Id: I41e1e98a9a64e516a294c4a94c8b5f335434078f
Merged-In: I41e1e98a9a64e516a294c4a94c8b5f335434078f
 2019-05-14 14:01:14 +08:00
Kevin Chyn
815e1912bf Merge "Update button string to "Start"" into qt-dev 
am: 9a252aa6b5

Change-Id: If4db1d8ef03f273641a7afe7869fd85104ddfe45
 2019-05-13 22:56:55 -07:00
Kevin Chyn
9a252aa6b5 Merge "Update button string to "Start"" into qt-dev 2019-05-14 05:49:05 +00:00