TreeHugger Robot
43083b4332
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
2017-05-05 20:48:50 +00:00
Fan Zhang
cdca63c4c7
Remove summary template in sleep timeout setting.
...
The template causes incorrect display in search, and it's not
needded by anyone in code.
Bug: 36101902
Test: rerun robotests
Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3
2017-05-05 13:40:36 -07:00
Roozbeh Pournader
15bebece94
Fix bidi direction of dialog and bidi-wrap service name
...
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.
Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.
Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes: 37761152
2017-05-05 13:40:05 -07:00
Fan Zhang
768824d7ad
Update tether summary text when airplane mode turns on
...
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix: 37934871
Test: make RunSettingsRoboTests
2017-05-05 12:55:11 -07:00
jackqdyulei
83e2511d45
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
...
am: 651261c7dd
Change-Id: I3c030efa5dc025dbeae7dfa059d58cd617f2691a
2017-05-05 19:24:11 +00:00
TreeHugger Robot
651261c7dd
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
2017-05-05 18:55:29 +00:00
jackqdyulei
01e690e377
Only use PROCESS_STATE_TOP as foreground time.
...
There are some miscalculations in state FOREGROUND_SERVICE and
FOREGROUND, so we move them out of the foreground time for now.
We will fix it after O and may add them back later.
Bug: 37000096
Test: RunSettingsRoboTests
Change-Id: Ic3f2f7fa69e8a213895c601630d1cca94fd32220
2017-05-05 10:23:09 -07:00
Bill Yi
9330470b28
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 2dcbda8004
-s ours
Change-Id: I8b39a0a9c01fff1d44613e98a390d257e3f2f858
2017-05-05 12:08:31 +00:00
TreeHugger Robot
2dcbda8004
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-05 11:58:06 +00:00
Bill Yi
566095ecf9
Import translations. DO NOT MERGE
...
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
2017-05-04 23:26:52 -07:00
Dan Sandler
ca445e20af
Merge "Defend against underspecified notifications." into oc-dev
...
am: 1bba60cf0e
Change-Id: I5aec6c34bd9c8b985637d38a73a21db88e6642a9
2017-05-05 02:25:31 +00:00
TreeHugger Robot
1bba60cf0e
Merge "Defend against underspecified notifications." into oc-dev
2017-05-05 02:21:11 +00:00
Suprabh Shukla
c1f10cb9c6
Adding SecureTouchListener to DeviceAdminAdd
...
Dropping any touches to the activate admin button if any other
window is partly or wholly obscuring the device admin add window
Test: Cts Verifier -> Device Administration -> Device Admin Tapjacking
Test
Bug: 35056974
Change-Id: I048ecc1944c13fea624eede7861d39df2beeb393
2017-05-04 18:50:33 -07:00
Ajay Panicker
bb98791b80
Merge "Limit btsnoop file size (4/9)" into oc-dev
...
am: b72a8b5ab3
-s ours
Change-Id: I2ecb2e2c297953eba1f515e636c6204e8474591e
2017-05-04 23:21:19 +00:00
Ajay Panicker
b72a8b5ab3
Merge "Limit btsnoop file size (4/9)" into oc-dev
2017-05-04 22:56:23 +00:00
Daniel Nishi
8381755263
Fix Settings crash in Storage settings.
...
If you tap aggressively before the fragment has fully initialized, it
was possible to NPE. This null-checks to avoid this.
Change-Id: I3488245d230cf1e16b23e34614c8e6b43ea14ff1
Fixes: 37945253
Test: Robotest
2017-05-04 14:12:45 -07:00
Julia Reynolds
c265993528
Merge "Only show one copy of each preference" into oc-dev
...
am: 31de48193e
Change-Id: Ic9b107c57e0db902e8a16c0054f533370c2f819d
2017-05-04 20:15:12 +00:00
Julia Reynolds
31de48193e
Merge "Only show one copy of each preference" into oc-dev
2017-05-04 20:08:39 +00:00
Doris Ling
bab86af55b
Add summary placeholder to data saver preference.
...
- reserve 2 lines for the data saver summary to avoid the preference
beging relayout when the summary text get updates.
Change-Id: Ibced7dc4b9620fe45541ea470d34bf83be66480d
Fix: 37925232
Test: visual
2017-05-04 12:37:52 -07:00
Daniel Nishi
7d50d9db12
Merge "Fix a bug where override filter was always on." into oc-dev
...
am: 408fd90102
Change-Id: I800644b0b754b6d2ff844531bfccce47caebfbe1
2017-05-04 17:30:41 +00:00
Esteban Talavera
895796aeb4
Merge "Show when work profile notifications are blocked for listener" into oc-dev
...
am: 607b4d0573
Change-Id: I7181d474d41c6574eea49f5fc65f06a9b75d2b1e
2017-05-04 17:30:18 +00:00
Daniel Nishi
408fd90102
Merge "Fix a bug where override filter was always on." into oc-dev
2017-05-04 17:18:37 +00:00
TreeHugger Robot
607b4d0573
Merge "Show when work profile notifications are blocked for listener" into oc-dev
2017-05-04 17:16:19 +00:00
Fan Zhang
d8b6244d82
Merge "Skip "null" string when building advanced button summary" into oc-dev
...
am: e4eb65c00e
Change-Id: Ife67012f081f60d06fc3cec7d40673dfb3e032dc
2017-05-04 16:17:46 +00:00
Fan Zhang
e4eb65c00e
Merge "Skip "null" string when building advanced button summary" into oc-dev
2017-05-04 16:12:27 +00:00
Julia Reynolds
fc730aa947
Only show one copy of each preference
...
Fixes: 37912144
Fixes: 37909560
Test: manual, load app settings for legacy and upgrade apps from
inline settings, click (i), and click back.
Change-Id: Ieb96cca03f2596fd44cd33facafa3d4af1fbc24d
2017-05-04 10:10:22 -04:00
Esteban Talavera
2db8240b87
Show when work profile notifications are blocked for listener
...
Bug: 36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit ee349792dd
)
2017-05-04 11:41:06 +00:00
Amin Shaikh
dec19d10c2
Show "Forget" button for ephemeral networks.
...
- Move forget button preference handling logic to
WifiDetailPreferenceController
- Remove unnecessary updateInfo call in onResume since
NETWORK_STATE_CHANGED_ACTION is a sticky broadcast
- Populate network state fields and set up initial wifi state
when the Preference is displayed instead of waiting for onResume
Bug: 37751816
Test: m RunSettingsRoboTests && manually tested on device
Change-Id: I509013c72a0d26fc9a3feca564d92a0ab8414d1e
2017-05-03 21:17:25 -07:00
Fan Zhang
7ab82146c1
Merge "Fix string where it says "phone" on a tablet." into oc-dev
...
am: efed517a8a
Change-Id: Ie45ef80d5b9a5307517497bf441dced20dd9062f
2017-05-04 02:28:22 +00:00
TreeHugger Robot
efed517a8a
Merge "Fix string where it says "phone" on a tablet." into oc-dev
2017-05-04 02:23:18 +00:00
Lorenzo Colitti
fdd0f1e141
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
...
am: 33b0104cfc
Change-Id: I38a3dfa0dcd17e073b6346dddfdd2d1434035b4a
2017-05-04 02:12:20 +00:00
Lorenzo Colitti
33b0104cfc
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
2017-05-04 02:06:50 +00:00
jackqdyulei
85950d5ebd
Merge "Update "Phone idle" subtext" into oc-dev
...
am: 3a1d6db0e7
Change-Id: I2c9b8a4c1d80911467d51ee883fb0a9a8bd01b43
2017-05-04 01:16:08 +00:00
Glen Kuhne
11853a75e3
Merge "Fix null pointer exception in wifi settings" into oc-dev
...
am: eb6eb99a56
Change-Id: Id7fa8980306e02e5b441278b76f01d9343119ecf
2017-05-04 01:15:47 +00:00
TreeHugger Robot
3a1d6db0e7
Merge "Update "Phone idle" subtext" into oc-dev
2017-05-04 01:11:24 +00:00
TreeHugger Robot
eb6eb99a56
Merge "Fix null pointer exception in wifi settings" into oc-dev
2017-05-04 01:04:50 +00:00
Daniel Nishi
bf1f93698e
Fix a bug where override filter was always on.
...
Change-Id: I1df52f13d8e335362d2eec18c968227ed9ecf299
Fixes: 37952170
Test: Settings unit test
2017-05-03 17:31:21 -07:00
Fan Zhang
91a03a9327
Fix string where it says "phone" on a tablet.
...
Change-Id: Id2e8fa1e1fef34e167c7ad25468dcd335baa73c6
Fix: 37833383
Test: visual
2017-05-03 17:03:55 -07:00
Jeremy Joslin
91dd31d722
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
...
am: b8eb78b321
Change-Id: I0be3efe4d409910fb8be30a3e667648d87d0975a
2017-05-03 23:05:59 +00:00
TreeHugger Robot
b8eb78b321
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
2017-05-03 22:57:16 +00:00
Glen Kuhne
3c5bd235f3
Fix null pointer exception in wifi settings
...
Fixes a null pointer exception that can occur during setup wizard.
Bug: 37873425
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I40de883fae6ccde13ad264f9b8b2d9da9745eb24
2017-05-03 15:53:16 -07:00
jackqdyulei
995ca362c9
Update "Phone idle" subtext
...
Bug: 37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
2017-05-03 15:27:50 -07:00
Fan Zhang
540023608d
Skip "null" string when building advanced button summary
...
- Also added help string to SoundSettings as a side fix.
Change-Id: Ia81a46c6e199b72b52ae1fa9d996c094193b506c
Fix: 37933524
Test: robotests
2017-05-03 15:05:22 -07:00
Daniel Nishi
f917c0aa24
Merge "Always use GB as the unit in Storage Settings." into oc-dev
...
am: 833927929e
Change-Id: I569b89bcf10fa32f86978c80fb646c0d4503b89e
2017-05-03 18:04:51 +00:00
Daniel Nishi
169fd4693f
Merge "Don't overly hide the Files preference." into oc-dev
...
am: 0c58fbd345
Change-Id: I4dbc750366d9fdbd6bc18abd751e47694de1d368
2017-05-03 18:04:17 +00:00
Daniel Nishi
833927929e
Merge "Always use GB as the unit in Storage Settings." into oc-dev
2017-05-03 18:00:19 +00:00
Daniel Nishi
0c58fbd345
Merge "Don't overly hide the Files preference." into oc-dev
2017-05-03 17:59:08 +00:00
Dan Sandler
d433f568f6
Defend against underspecified notifications.
...
While we're here, show the channelId and other O features of
notifications in the extra text.
(Also make a halfhearted attempt to keep an expanded
notification open while other notifications are updating.)
Bug: 37646836
Test: none
Change-Id: I1b34ae9aaeb0af1e9f993354cebef8644050bed2
2017-05-03 13:43:44 +00:00
Lorenzo Colitti
b6245156f6
Add a "sign into network" button to the wifi details page.
...
Bug: 36203355
Test: manually signed into captive portal
Test: make -j64 RunSettingsRoboTests
Change-Id: I3242ef30125ddfdaaac9b80ead4f8ac14ea6d364
2017-05-03 22:14:08 +09:00
jackqdyulei
09adbd2f3b
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
...
am: 4b50e58a1d
Change-Id: I2997ffe57474de973a66932b685fbbaf9bf77955
2017-05-03 02:24:48 +00:00