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
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
Salvador Martinez
c1a44d6b42
Add metrics stuff for dark ui dialog fragment
...
This constant was delayed due to some high traffic in the file
and deadlines. This CL just adds it.
Test: None, is a metrics change
Bug: 132695689
Change-Id: I2ccdfa8de93e062558cf6a6b49fa85a69cef7b82
2019-05-14 10:32:34 -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
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
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
Cn Chen
1062d3376d
Merge "Font size page support light theme in deferred setup."
2019-05-14 05:55:09 +00:00
Kevin Chyn
9a252aa6b5
Merge "Update button string to "Start"" into qt-dev
2019-05-14 05:49:05 +00:00
Jason Chiu
1568c82bc9
Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev am: 8bc21da216
...
am: 28d513fc32
Change-Id: I58d2b2a50eda5155bb70810325897a46c916e14a
2019-05-13 22:17:11 -07:00
Jason Chiu
28d513fc32
Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev
...
am: 8bc21da216
Change-Id: Ibc6bbef7f4f257cb0a144daaff0774b088392784
2019-05-13 22:14:04 -07:00
TreeHugger Robot
8bc21da216
Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev
2019-05-14 04:44:27 +00:00
Andy Chou
1a48e4cf9b
Merge "Fix IMEI information can't display without pSIM inserted" into qt-dev am: e553afa7f3
...
am: 761dc8cc6e
Change-Id: Ibd6aee1d1f8e85676df911c3f0ac247e09f0dd8a
2019-05-13 21:12:36 -07:00
Andy Chou
761dc8cc6e
Merge "Fix IMEI information can't display without pSIM inserted" into qt-dev
...
am: e553afa7f3
Change-Id: I669384cfa38e376d0783015285a5cebc1397b8c2
2019-05-13 20:53:09 -07:00
Kevin Chang
7eddb0e4dc
Change string of switchbar and installed service category title
...
Bug: 122897712
Test: Visual
Change-Id: I4e15ebc8b91c58d24aadb7e665c6692ebcd627a8
2019-05-14 11:47:19 +08:00
Andy Chou
e553afa7f3
Merge "Fix IMEI information can't display without pSIM inserted" into qt-dev
2019-05-14 03:32:26 +00:00
joshmccloskey
7e470bf806
Increased char limit for translations
...
Test: It builds.
Bug: 132638233
Change-Id: Ie7deaf82471c832351af9f25f7b4725b65f3c66a
2019-05-13 19:29:24 -07:00
Mehdi Alizadeh
5da39b16b7
Merge "Refactors the System Navigation settings page" into qt-dev am: e575fc44f5
...
am: e53b5845b9
Change-Id: Ie33befe3f79bf5a6e79a8fd2e9df32f96e9f1b97
2019-05-13 18:44:32 -07:00
Kevin Chyn
940e7e748a
Merge "Revert "Corrected flow for accessibility.""
2019-05-14 01:33:59 +00:00
Lei Yu
83db3dc80d
Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev am: 1ffae41f4e
...
am: cdd91541c1
Change-Id: Ie96e8da080476bb698dfc80f59787ee188716b96
2019-05-13 18:31:24 -07:00
Kevin Chyn
4fe9d1a045
Merge "Revert "Corrected flow for accessibility."" into qt-dev am: cb38ac25a6
...
am: 07649a92ee
Change-Id: I830e470143a0779486ebf0f8e4b4eff86a3ea351
2019-05-13 18:30:31 -07:00