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
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
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
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
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
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
joshmccloskey
a336a7c9f1
Fixed talkback issue
...
Test: It builds
Fixes: 132635400
Change-Id: I6b3d42561d848a2fdc0f366a96bf3284e5a757fe
2019-05-13 18:24:51 -07:00
Kevin Chyn
200dd1b8b3
Update button string to "Start"
...
Fixes: 132648319
Test: Builds
Change-Id: I05fa1a8d4d24d5ebef95588df64442718bf42c99
2019-05-13 18:23:22 -07:00
Mehdi Alizadeh
e53b5845b9
Merge "Refactors the System Navigation settings page" into qt-dev
...
am: e575fc44f5
Change-Id: I6e308e2b0bd2e1c6c8cc0dd55f184480e4b2145c
2019-05-13 18:22:43 -07:00
Mehdi Alizadeh
e575fc44f5
Merge "Refactors the System Navigation settings page" into qt-dev
2019-05-14 01:08:22 +00:00
Lei Yu
cdd91541c1
Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev
...
am: 1ffae41f4e
Change-Id: I483907ea77225c8962977d53b9709d681dbf3ac3
2019-05-13 18:05:08 -07:00
Kevin Chyn
07649a92ee
Merge "Revert "Corrected flow for accessibility."" into qt-dev
...
am: cb38ac25a6
Change-Id: Ieabc431df3d0b61653a05e6e506c3c88b2dbc35d
2019-05-13 18:04:08 -07:00
joshmccloskey
4e20bb7368
Merge "Reduced next button enabled delay to 8 seconds" into qt-dev
...
am: 987c97c5e1
Change-Id: Ibc817788e2910ce3ef60b2fb0ab04b299a790ea0
2019-05-13 18:03:18 -07:00
TreeHugger Robot
1ffae41f4e
Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev
2019-05-14 00:54:58 +00:00
Kevin Chyn
cb38ac25a6
Merge "Revert "Corrected flow for accessibility."" into qt-dev
2019-05-14 00:48:49 +00:00
Kevin Chyn
0c37f27355
Revert "Corrected flow for accessibility."
...
This reverts commit b9cb83e4c6
.
Reason for revert: broke build
Bug: 132635400
Change-Id: I15d4db26e3dd9172894354a39be13acc69642090
2019-05-14 00:47:08 +00:00
TreeHugger Robot
987c97c5e1
Merge "Reduced next button enabled delay to 8 seconds" into qt-dev
2019-05-14 00:46:25 +00:00
Antony Sargent
7e155aa244
Merge "Strings for "Data during calls" preference" into qt-dev
...
am: 27de8ae098
Change-Id: I25bb3ec44e8e24de51b3b55bb444f2828e05019e
2019-05-13 17:29:28 -07:00
Lifu Tang
cf5deb067f
Merge "Revert recent location apps to pre-Q behavior" into qt-dev
...
am: 3d6bacc731
Change-Id: Iacc48610f25fed5c3598c90c03de58eea26a1135
2019-05-13 17:24:44 -07:00
Mehdi Alizadeh
8ca5e7862a
Merge "Update strings for System Navigation settings page" into qt-dev
...
am: 485b3ad655
Change-Id: I9a6135103076c4ab3cdc815332493f776251fe09
2019-05-13 17:23:29 -07:00
Fan Zhang
886c361bb7
Merge "Make subsettings display edge-to-edge" into qt-dev
...
am: 66db1f95e0
Change-Id: Ie4b8a19b7fe798810763c63196aff92812a1de25
2019-05-13 17:22:47 -07:00
Raff Tsai
c74dcafb6c
Merge "Fix robolectric test error" into qt-dev
...
am: 3f845f8dd9
Change-Id: I7d9420e1558aa0ea5d19cb5c00c25357c2abc1b4
2019-05-13 17:22:08 -07:00
TreeHugger Robot
27de8ae098
Merge "Strings for "Data during calls" preference" into qt-dev
2019-05-14 00:19:07 +00:00
TreeHugger Robot
3d6bacc731
Merge "Revert recent location apps to pre-Q behavior" into qt-dev
2019-05-14 00:07:28 +00:00
Mehdi Alizadeh
485b3ad655
Merge "Update strings for System Navigation settings page" into qt-dev
2019-05-14 00:07:25 +00:00
TreeHugger Robot
66db1f95e0
Merge "Make subsettings display edge-to-edge" into qt-dev
2019-05-14 00:05:47 +00:00
TreeHugger Robot
3f845f8dd9
Merge "Fix robolectric test error" into qt-dev
2019-05-14 00:04:59 +00:00