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

52810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sorin Dinu
023f173f20 Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065 
am: ef18f553fa

Change-Id: I0d7e09529af9a8d28507be073cebcc30c3568691
 2019-05-15 22:54:23 -07:00
Kevin Chang
cca9206ccc Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443 
am: a4a1055d7c

Change-Id: I2373bd354a2226961d8813186435c0ef4942fb20
 2019-05-15 21:45:52 -07:00
Salvador Martinez
3af5cccb8d Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d am: db30782bbf 
am: e44f8c9dfb

Change-Id: I47085873bd446aff399c94c2dca7fa9c0eee8d10
 2019-05-15 20:07:28 -07:00
Sorin Dinu
ef18f553fa Merge "Added icons for partial system update card in the Security category" into qt-dev 
am: 2e26605065

Change-Id: If24fb2625730e97da26a00504f740a8e87480b80
 2019-05-15 19:55:16 -07: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
Salvador Martinez
e44f8c9dfb Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d 
am: db30782bbf

Change-Id: I74bebd7ad974750c96353e9bdae1656df90cabdd
 2019-05-15 16:51:33 -07:00
Lei Yu
1cdbbf314d Merge "Use NetworkTemplate to query data" into qt-dev am: 6b2030a17a am: 6d260e680f 
am: 9afefb4bca

Change-Id: I9f28e42375848c8708b3632d6ea5bf7691a4abdc
 2019-05-15 14:50:58 -07:00
Fan Zhang
5120371830 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7 am: d32e9b5229 
am: 8bf20201d6

Change-Id: If9ed007fce8215f3e4b19b8f1e8d42576c221dca
 2019-05-15 14:33:49 -07:00
Lei Yu
9afefb4bca Merge "Use NetworkTemplate to query data" into qt-dev am: 6b2030a17a 
am: 6d260e680f

Change-Id: If038d443817e64f70dc3af2876772b6805ad3028
 2019-05-15 13:32:25 -07:00
Fan Zhang
8bf20201d6 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7 
am: d32e9b5229

Change-Id: Ib3f575faa30b5e55a44e71c28c2874bc3c4a7800
 2019-05-15 13:31:28 -07:00
Sorin Dinu
64f6da4d75 Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065 
am: bfb45b6177

Change-Id: Ie3ac8ac7fa860891f286c16cc83dabc1a61fe0a4
 2019-05-15 00:00:37 -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
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
Colin Cross
e43660a00d Merge "Convert Settings to Android.bp" into qt-dev-plus-aosp 
am: a7125ade35

Change-Id: I7627072b9a64c6713acc657e47a7755dca7383f9
 2019-05-14 17:58:41 -07: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
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
d7de47e6d9 Merge "Increased char limit for translations" into qt-dev am: 5513a9bdd1 
am: 1e84e431d8

Change-Id: Ic97c962c5acd3d520827ac23d8e89a0c61f5b5c4
 2019-05-14 12:39:09 -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
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
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
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
b5d54ae273 [automerger skipped] Merge "Font size page support light theme in deferred setup" into qt-dev am: 421a05a6a9 
am: b5b3699f4c -s ours
am skip reason: change_id I41e1e98a9a64e516a294c4a94c8b5f335434078f with SHA1 7a83d51a6b is in history

Change-Id: Ia38aa5e4f519c433245b174250ab38d4aa3b96b2
 2019-05-14 00:37:38 -07: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
Kevin Chyn
b79cba7d1f Merge "Update button string to "Start"" into qt-dev am: 9a252aa6b5 
am: 815e1912bf

Change-Id: I743bfbb262a6f0f3e0f249beff06aabe21478f12
 2019-05-13 23:02:01 -07: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