Doris Ling
ce5e0c3dc6
Merge "Fix crash when silencing condition." into oc-dev
...
am: ba2f3ee3ba
2017-05-10 01:45:17 +00:00
xudiwen
18615600ae
NullPointerException when running monkey test in IccLockSettings
...
In Android N, finish() in onCreate() cannot avoid onViewCreated() lifecycle
in Fragment, so a crash occurs in com.android.settings.IccLockSettings
because of insecure call in updatePreference().
It's a tiny bug only appears when running monkey test.
Test: run monkey test with page IccLockSettings.
This bug was reported to Google Issue Tracker.
Link: https://issuetracker.google.com/issues/38152568
Change-Id: I143b046fd7ac5ffba55e51254c7dd068274d342e
Signed-off-by: xudiwen <xudiwen@xiaomi.com >
2017-05-10 09:40:41 +08:00
TreeHugger Robot
ba2f3ee3ba
Merge "Fix crash when silencing condition." into oc-dev
2017-05-10 01:40:35 +00:00
Fan Zhang
031c838162
Update setting icon paddings to align with actionbar title
...
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix: 38011653
Test: visual
2017-05-10 00:48:24 +00:00
Matthew Fritze
ec6cfe32fd
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
...
am: 120ec5d1eb
2017-05-09 21:41:39 +00:00
Bill Yi
6d75c92f32
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 4a0abee70e
2017-05-09 21:34:01 +00:00
Amin Shaikh
a5cf6fbf37
Update "Open networks available" setting.
...
- Remove gating ONA toggle on whether network recommendations are
enabled. It is always on and provided by the wifi framework.
Bug: 37794067
Test: m RunSettingsRoboTests && tested locally
Change-Id: I312858d50b348bbe829538d4fa337b2072cb2043
2017-05-09 14:04:45 -07:00
Amin Shaikh
dfa9bb8914
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
...
This reverts commit 2c4b42c0b7
2017-05-09 13:56:51 -07:00
TreeHugger Robot
120ec5d1eb
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
2017-05-09 19:59:58 +00:00
TreeHugger Robot
4a0abee70e
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-09 18:25:53 +00:00
Phil Weaver
9a1b4eb21f
Don't enable a11y service if scary dialog obscured
...
Bug: 38134845
Test: Trivial back-port of ag/2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
2017-05-09 10:51:32 -07:00
Bookatz
9b54572992
Merge "Add BLE results counter to batterystats" into oc-dev
...
am: b296697e8e
2017-05-09 17:08:16 +00:00
Matthew Fritze
9615f82abf
Prevent non-blocking whitespaces from showing up in search
...
When search results use the placeholder summary text,
it becomes non-breaking whitespace. If that is the
summary, set the visibility to gone.
Change-Id: Ic3987a0990c33b6cc5aabffa0782ece6c553784a
Merged-In: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
Fixes: 38029215
Test: make RunSettingsRoboTests
2017-05-09 16:42:40 +00:00
TreeHugger Robot
b296697e8e
Merge "Add BLE results counter to batterystats" into oc-dev
2017-05-09 16:03:28 +00:00
Bill Yi
d8f1255323
Import translations. DO NOT MERGE
...
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
2017-05-09 04:07:09 -07:00
Fan Zhang
b3afa6e84f
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
...
am: ce7f36c799
2017-05-09 01:44:00 +00:00
TreeHugger Robot
ce7f36c799
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
2017-05-09 01:25:18 +00:00
Daniel Nishi
89effe9cbf
Fix the top summary layout.
...
This changes the margin to the proper 32dp and updates the style on the
title text to be consistent with the rest of Settings.
Bug: 35245772
Test: Manual
Change-Id: Ib980e22d9fac258dd5a72385a2c80060561aa5ac
2017-05-08 17:01:11 -07:00
Stephen Chen
95a98f0686
Merge "Added WifiSettings Espresso tests." into oc-dev
...
am: 6c0f337d52
2017-05-08 23:42:59 +00:00
TreeHugger Robot
6c0f337d52
Merge "Added WifiSettings Espresso tests." into oc-dev
2017-05-08 23:39:22 +00:00
Fan Zhang
df2ecdf3f0
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
...
am: 2dbc30dc58
2017-05-08 23:08:31 +00:00
TreeHugger Robot
2dbc30dc58
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
2017-05-08 22:59:06 +00:00
Jesse Evans
78e3a051d8
Properly set isInstantApp for power usage page
...
Previously the app header was not properly configured to be aware
it was rendering an instant app. This change properly sets the value
and adds tests to ensure it is correclty set in the future.
Test: make RunSettingsRoboTests -j30
Bug: 37919863
Change-Id: I0cbe2cb03bcd44208408f68188387e53ae98d8fb
2017-05-08 15:53:47 -07:00
Doris Ling
b72163b9d0
Fix crash when silencing condition.
...
- check if the broadcast receiver is being registered before trying to
un-regist it.
Change-Id: I6af215f393d16173f317c9e5bc05237c935e7133
Fix: 38131851
Test: make RunSettingsRoboTests
2017-05-08 15:28:33 -07:00
Stephen Chen
db332d4aa7
Added WifiSettings Espresso tests.
...
Added test cases for toggling Wi-Fi state, connected access points, and
saved network preferences.
Bug: 35322629
Bug: 35322690
Bug: 35322875
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Iaba7fb2fa90cf0f37538c4b1ef141cf6b15d7f52
2017-05-08 14:48:01 -07:00
Daniel Nishi
24077d899f
Add the badged icon for Movies & TV.
...
The work profile was missing the icon.
Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes: 38132211
Test: Settings robotest
2017-05-08 14:13:13 -07:00
Matthew Fritze
43171ef58a
Merge "Prevent race conditions after dropping database" into oc-dev
...
am: fc8e64eccb
2017-05-08 21:05:20 +00:00
Stephen Chen
95640767d1
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
...
am: f7980fc3cb
2017-05-08 21:04:55 +00:00
Doris Ling
06b670e4df
Merge "Add summary placeholder to data saver preference." into oc-dev
...
am: a3c4339299
2017-05-08 21:04:28 +00:00
TreeHugger Robot
fc8e64eccb
Merge "Prevent race conditions after dropping database" into oc-dev
2017-05-08 20:51:04 +00:00
TreeHugger Robot
f7980fc3cb
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
2017-05-08 20:44:12 +00:00
TreeHugger Robot
a3c4339299
Merge "Add summary placeholder to data saver preference." into oc-dev
2017-05-08 20:43:56 +00:00
Fan Zhang
966be254ab
Remove placeholder summary text in auto-rotate preference
...
- Remove the %s from xml and set it in code instead.
- This is hack to make search stop display %s. It's fixed properly in
master but we don't want to cherry-pick the master change because of its
size and risk.
Bug: 36101902
Test: rerun robotests
Change-Id: I0e03957532b265c15d5cc0754396aea26e5cd8a1
Merged-In: If42cceb74296814311eb0eff8e26b4a48a1c4d29
2017-05-08 13:37:07 -07:00
Fan Zhang
86d4d51b62
Fix PrefCategory layout to align text with actionbar title
...
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix: 38011653
Test: visual
2017-05-08 13:03:46 -07:00
Fan Zhang
f7ba1e7209
Merge "Remove summary template in sleep timeout setting." into oc-dev
...
am: 014ff46fa6
2017-05-08 19:08:20 +00:00
Svetoslav Ganov
bf3ad99a38
Merge "Report normalized package name as default key" into oc-dev
...
am: 0560127e9d
2017-05-08 19:07:55 +00:00
TreeHugger Robot
014ff46fa6
Merge "Remove summary template in sleep timeout setting." into oc-dev
2017-05-08 18:57:57 +00:00
Svetoslav Ganov
0560127e9d
Merge "Report normalized package name as default key" into oc-dev
2017-05-08 18:57:23 +00:00
Svet Ganov
7d3fb0481d
Report normalized package name as default key
...
Test: make RunSettingsRoboTests -j90
bug:36978445
Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
2017-05-08 18:56:47 +00:00
Matthew Fritze
ab0b3f6790
Prevent race conditions after dropping database
...
Block all loaders from accessing the database
before indexing is complete.
Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I2af98dcf6bceacbeffa70bd40879c97bb0cbc828
Merged-In: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
2017-05-08 18:48:04 +00:00
Matthew Fritze
7ae3c078b6
Remove accessibility duplicates in settings search
...
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-08 18:34:43 +00:00
Amin Shaikh
293a0f003a
Merge "Show "Forget" button for ephemeral networks." into oc-dev
...
am: 3f303d5fd8
2017-05-08 17:11:48 +00:00
TreeHugger Robot
3f303d5fd8
Merge "Show "Forget" button for ephemeral networks." into oc-dev
2017-05-08 17:07:33 +00:00
Daniel Nishi
bc628dfdd9
Merge "Fix Settings crash in Storage settings." into oc-dev
...
am: 816956d249
2017-05-08 16:50:17 +00:00
Daniel Nishi
816956d249
Merge "Fix Settings crash in Storage settings." into oc-dev
2017-05-08 16:45:07 +00:00
nharold
d460c1a6b3
Merge "Update references to use PhoneConstantConversion" am: 79694e79d1 am: 98f209c6e5
...
am: 2e4950879a
2017-05-06 02:55:47 +00:00
Fan Zhang
779548122b
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
...
am: 4f5b13f97a
2017-05-06 02:46:38 +00:00
TreeHugger Robot
4f5b13f97a
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
2017-05-06 02:42:38 +00:00
nharold
2e4950879a
Merge "Update references to use PhoneConstantConversion" am: 79694e79d1
...
am: 98f209c6e5
2017-05-06 02:07:30 +00:00
nharold
98f209c6e5
Merge "Update references to use PhoneConstantConversion"
...
am: 79694e79d1
2017-05-06 01:57:56 +00:00
