OSDN Git Service
Matthew Fritze [Thu, 11 May 2017 00:20:13 +0000 (00:20 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
am:
ec00573139
Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e
Alison Cichowlas [Thu, 11 May 2017 00:19:46 +0000 (00:19 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
am:
b9a2d6a6e3
Change-Id: I20c3fc6dc977145a9f9938c470ea69a393061000
Daniel Nishi [Thu, 11 May 2017 00:19:20 +0000 (00:19 +0000)]
Merge "Fix the top summary layout." into oc-dev
am:
154824f124
Change-Id: I5f062c3d6d6df40c0e78f353f608c7efa7137c9f
Daniel Nishi [Thu, 11 May 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
am:
9a5bac7d5a
Change-Id: I59cea940381aa360be456c44afb36c58964c3065
TreeHugger Robot [Wed, 10 May 2017 20:16:13 +0000 (20:16 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
Alison Cichowlas [Wed, 10 May 2017 18:42:52 +0000 (18:42 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
Alison Cichowlas [Tue, 9 May 2017 18:01:42 +0000 (14:01 -0400)]
Notifications settings updates to match spec:
- change badge language & remove summary
- change caps on sound text
Bug:
37479730,
37480708
Test: string changes manually verified
Change-Id: Iae7416cecd2cd6d84c2a05fd707f791bc5fe7ceb
Matthew Fritze [Wed, 3 May 2017 01:43:31 +0000 (18:43 -0700)]
Only add icons to settings items with icons
Currently the icon for the category of setting is used for
each setting result. Change it to only add an icon when
it exists in xml.
Bug:
37858983
Test: make RunSettingsRoboTests
Change-Id: Ib95e76c5a9ba2e73738cea716d72c5994a6aa0ba
Daniel Nishi [Wed, 10 May 2017 17:59:37 +0000 (17:59 +0000)]
Merge "Fix the top summary layout." into oc-dev
Daniel Nishi [Wed, 10 May 2017 17:59:08 +0000 (17:59 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
Matthew Fritze [Wed, 10 May 2017 05:24:56 +0000 (05:24 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev
am:
8fc602fed8
Change-Id: Id19a964f26287a8f35a30ea33cf784deab088921
TreeHugger Robot [Wed, 10 May 2017 05:07:52 +0000 (05:07 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev
Fan Zhang [Wed, 10 May 2017 03:02:21 +0000 (03:02 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
am:
8ff8b5e95b
Change-Id: I60efa39b81e3f54f6e3e9c37f45c751dbb48966c
TreeHugger Robot [Wed, 10 May 2017 02:57:18 +0000 (02:57 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
Doris Ling [Wed, 10 May 2017 01:45:17 +0000 (01:45 +0000)]
Merge "Fix crash when silencing condition." into oc-dev
am:
ba2f3ee3ba
Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
TreeHugger Robot [Wed, 10 May 2017 01:40:34 +0000 (01:40 +0000)]
Merge "Fix crash when silencing condition." into oc-dev
Fan Zhang [Wed, 10 May 2017 00:44:49 +0000 (17:44 -0700)]
Update setting icon paddings to align with actionbar title
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix:
38011653
Test: visual
Matthew Fritze [Tue, 9 May 2017 21:41:39 +0000 (21:41 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
am:
120ec5d1eb
Change-Id: Ic9bf5fc2aaa99592c362a3159aea0b11cb7ec950
Bill Yi [Tue, 9 May 2017 21:34:01 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4a0abee70e -s ours
Change-Id: Ifc6b44fa916a03435be579d49c56362d4b71f576
TreeHugger Robot [Tue, 9 May 2017 19:59:58 +0000 (19:59 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 18:25:53 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bookatz [Tue, 9 May 2017 17:08:16 +0000 (17:08 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
am:
b296697e8e
Change-Id: Ic5fca069ab56fd2b9bebb12f27c13a27b7f94b35
Matthew Fritze [Fri, 5 May 2017 18:05:53 +0000 (11:05 -0700)]
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
TreeHugger Robot [Tue, 9 May 2017 16:03:16 +0000 (16:03 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
Bill Yi [Tue, 9 May 2017 11:07:09 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
Fan Zhang [Tue, 9 May 2017 01:44:00 +0000 (01:44 +0000)]
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
am:
ce7f36c799
Change-Id: I4bf3958e80286634dfc7d23f4133174d221be3b4
TreeHugger Robot [Tue, 9 May 2017 01:25:16 +0000 (01:25 +0000)]
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
Daniel Nishi [Tue, 9 May 2017 00:01:11 +0000 (17:01 -0700)]
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
Stephen Chen [Mon, 8 May 2017 23:42:59 +0000 (23:42 +0000)]
Merge "Added WifiSettings Espresso tests." into oc-dev
am:
6c0f337d52
Change-Id: I91235f3fc1754539d055a4e24e395705c7b8f967
TreeHugger Robot [Mon, 8 May 2017 23:39:21 +0000 (23:39 +0000)]
Merge "Added WifiSettings Espresso tests." into oc-dev
Fan Zhang [Mon, 8 May 2017 23:08:31 +0000 (23:08 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
am:
2dbc30dc58
Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
TreeHugger Robot [Mon, 8 May 2017 22:58:55 +0000 (22:58 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
Doris Ling [Mon, 8 May 2017 22:08:58 +0000 (15:08 -0700)]
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
Stephen Chen [Mon, 1 May 2017 21:40:19 +0000 (14:40 -0700)]
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
Daniel Nishi [Mon, 8 May 2017 21:13:13 +0000 (14:13 -0700)]
Add the badged icon for Movies & TV.
The work profile was missing the icon.
Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes:
38132211
Test: Settings robotest
Matthew Fritze [Mon, 8 May 2017 21:05:20 +0000 (21:05 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev
am:
fc8e64eccb
Change-Id: I4cb1f8685c5d1f43aa5ce5b5b5e124d1240e43bd
Stephen Chen [Mon, 8 May 2017 21:04:55 +0000 (21:04 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
am:
f7980fc3cb
Change-Id: I0b9866922e764afba8f0b642fa16531cd48b73c0
Doris Ling [Mon, 8 May 2017 21:04:28 +0000 (21:04 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev
am:
a3c4339299
Change-Id: Ia9ab661f1e870764c8e13c945389d734cbee14d4
TreeHugger Robot [Mon, 8 May 2017 20:51:03 +0000 (20:51 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:44:11 +0000 (20:44 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev
Fan Zhang [Mon, 8 May 2017 20:15:58 +0000 (13:15 -0700)]
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
Fan Zhang [Fri, 5 May 2017 16:19:13 +0000 (09:19 -0700)]
Fix PrefCategory layout to align text with actionbar title
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix:
38011653
Test: visual
Fan Zhang [Mon, 8 May 2017 19:08:20 +0000 (19:08 +0000)]
Merge "Remove summary template in sleep timeout setting." into oc-dev
am:
014ff46fa6
Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
Svetoslav Ganov [Mon, 8 May 2017 19:07:55 +0000 (19:07 +0000)]
Merge "Report normalized package name as default key" into oc-dev
am:
0560127e9d
Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265
TreeHugger Robot [Mon, 8 May 2017 18:57:56 +0000 (18:57 +0000)]
Merge "Remove summary template in sleep timeout setting." into oc-dev
Svetoslav Ganov [Mon, 8 May 2017 18:57:22 +0000 (18:57 +0000)]
Merge "Report normalized package name as default key" into oc-dev
Svet Ganov [Sat, 6 May 2017 22:49:27 +0000 (15:49 -0700)]
Report normalized package name as default key
Test: make RunSettingsRoboTests -j90
bug:
36978445
Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
Matthew Fritze [Tue, 25 Apr 2017 16:38:56 +0000 (09:38 -0700)]
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
Matthew Fritze [Mon, 17 Apr 2017 14:55:41 +0000 (07:55 -0700)]
Remove accessibility duplicates in settings search
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
Amin Shaikh [Mon, 8 May 2017 17:11:48 +0000 (17:11 +0000)]
Merge "Show "Forget" button for ephemeral networks." into oc-dev
am:
3f303d5fd8
Change-Id: Ic8c5028ac48b36a03871423cb867518fd5d38dc4
TreeHugger Robot [Mon, 8 May 2017 17:07:32 +0000 (17:07 +0000)]
Merge "Show "Forget" button for ephemeral networks." into oc-dev
Daniel Nishi [Mon, 8 May 2017 16:50:17 +0000 (16:50 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev
am:
816956d249
Change-Id: I3bd38a5cd716df4d4c91ab762870ad74c626de6d
Daniel Nishi [Mon, 8 May 2017 16:45:06 +0000 (16:45 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev
nharold [Sat, 6 May 2017 02:55:47 +0000 (02:55 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1 am:
98f209c6e5
am:
2e4950879a
Change-Id: I656450f32a00f9a761a6d0069d2f3c59b729e0f5
Fan Zhang [Sat, 6 May 2017 02:46:38 +0000 (02:46 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
am:
4f5b13f97a
Change-Id: I7166624e96ed82f523545f390457661dfb7c3d42
TreeHugger Robot [Sat, 6 May 2017 02:42:37 +0000 (02:42 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
nharold [Sat, 6 May 2017 02:07:30 +0000 (02:07 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1
am:
98f209c6e5
Change-Id: I5c7760471d2e48df20955122507b503ca546954e
nharold [Sat, 6 May 2017 01:57:56 +0000 (01:57 +0000)]
Merge "Update references to use PhoneConstantConversion"
am:
79694e79d1
Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge "Update references to use PhoneConstantConversion"
Roozbeh Pournader [Sat, 6 May 2017 01:39:29 +0000 (01:39 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
am:
869d246021
Change-Id: Idb17d5f38526c926ddf2d0ca55d30f806c52d574
TreeHugger Robot [Sat, 6 May 2017 01:34:46 +0000 (01:34 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
Fan Zhang [Fri, 5 May 2017 22:03:19 +0000 (15:03 -0700)]
Fix crash when there is no emergencybroadcast app on device
Some devices do not have emergencybroadcast app installed, so we should
not show the preference item for it. Add the preference controller into
AppAndNotificationFragment properly hides it.
Change-Id: Ic39ba24da9bd8f3200a5e44232a5489e35c48c0a
Fix:
37945069
Test: make RunSettingsRoboTests
Doris Ling [Sat, 6 May 2017 00:02:54 +0000 (00:02 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
am:
f9d9524574
Change-Id: I8b02370267e682ec17efcdf877c960e4189304ae
TreeHugger Robot [Fri, 5 May 2017 23:59:27 +0000 (23:59 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
Fan Zhang [Fri, 5 May 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev
am:
fe5d64feb0
Change-Id: I3bfc37b5bcdcf562faf2c528048e0a5c9427a8f2
Doris Ling [Wed, 3 May 2017 23:22:40 +0000 (16:22 -0700)]
Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check
the app permission info, check for null package info and only process
the permission info when package info is available.
- Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to
PackageManager.MATCH_ANY_USER, as the implementation for querying
packages for other users have been changed.
- Add PackageManager APIs used by AppStateAppOpsBridge to
IPackageManagerWrapper for test purpose.
- Change UserManager.get() to Context.getSystemService() to fix test
failure.
Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61
Fix:
37409266
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 5 May 2017 21:52:06 +0000 (21:52 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev
Suprabh Shukla [Fri, 5 May 2017 20:56:10 +0000 (20:56 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am:
43083b4332
Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
TreeHugger Robot [Fri, 5 May 2017 20:48:41 +0000 (20:48 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
Fan Zhang [Fri, 5 May 2017 17:19:52 +0000 (10:19 -0700)]
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
Roozbeh Pournader [Fri, 5 May 2017 20:40:05 +0000 (13:40 -0700)]
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
Fan Zhang [Thu, 4 May 2017 16:12:12 +0000 (09:12 -0700)]
Update tether summary text when airplane mode turns on
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix:
37934871
Test: make RunSettingsRoboTests
jackqdyulei [Fri, 5 May 2017 19:24:11 +0000 (19:24 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
am:
651261c7dd
Change-Id: I3c030efa5dc025dbeae7dfa059d58cd617f2691a
TreeHugger Robot [Fri, 5 May 2017 18:55:27 +0000 (18:55 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
jackqdyulei [Thu, 4 May 2017 19:38:08 +0000 (12:38 -0700)]
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
Bill Yi [Fri, 5 May 2017 12:08:31 +0000 (12:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2dcbda8004 -s ours
Change-Id: I8b39a0a9c01fff1d44613e98a390d257e3f2f858
TreeHugger Robot [Fri, 5 May 2017 11:58:05 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 5 May 2017 06:26:52 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
Dan Sandler [Fri, 5 May 2017 02:25:31 +0000 (02:25 +0000)]
Merge "Defend against underspecified notifications." into oc-dev
am:
1bba60cf0e
Change-Id: I5aec6c34bd9c8b985637d38a73a21db88e6642a9
TreeHugger Robot [Fri, 5 May 2017 02:21:10 +0000 (02:21 +0000)]
Merge "Defend against underspecified notifications." into oc-dev
Suprabh Shukla [Wed, 3 May 2017 01:06:16 +0000 (18:06 -0700)]
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
Ajay Panicker [Thu, 4 May 2017 23:21:19 +0000 (23:21 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev
am:
b72a8b5ab3 -s ours
Change-Id: I2ecb2e2c297953eba1f515e636c6204e8474591e
Ajay Panicker [Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev
Daniel Nishi [Wed, 3 May 2017 20:36:36 +0000 (13:36 -0700)]
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
Julia Reynolds [Thu, 4 May 2017 20:15:12 +0000 (20:15 +0000)]
Merge "Only show one copy of each preference" into oc-dev
am:
31de48193e
Change-Id: Ic9b107c57e0db902e8a16c0054f533370c2f819d
Julia Reynolds [Thu, 4 May 2017 20:08:38 +0000 (20:08 +0000)]
Merge "Only show one copy of each preference" into oc-dev
Doris Ling [Thu, 4 May 2017 19:35:31 +0000 (12:35 -0700)]
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
Daniel Nishi [Thu, 4 May 2017 17:30:41 +0000 (17:30 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev
am:
408fd90102
Change-Id: I800644b0b754b6d2ff844531bfccce47caebfbe1
Esteban Talavera [Thu, 4 May 2017 17:30:18 +0000 (17:30 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev
am:
607b4d0573
Change-Id: I7181d474d41c6574eea49f5fc65f06a9b75d2b1e
Daniel Nishi [Thu, 4 May 2017 17:18:35 +0000 (17:18 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev
Fan Zhang [Thu, 4 May 2017 16:17:46 +0000 (16:17 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev
am:
e4eb65c00e
Change-Id: Ife67012f081f60d06fc3cec7d40673dfb3e032dc
Fan Zhang [Thu, 4 May 2017 16:12:25 +0000 (16:12 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev
Julia Reynolds [Thu, 4 May 2017 14:10:22 +0000 (10:10 -0400)]
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
Esteban Talavera [Wed, 5 Apr 2017 15:31:10 +0000 (16:31 +0100)]
Show when work profile notifications are blocked for listener
Bug:
36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit
ee349792dd4d34bbbdc10446c88ce5f370d5347c)
Amin Shaikh [Tue, 2 May 2017 23:33:37 +0000 (16:33 -0700)]
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
Fan Zhang [Thu, 4 May 2017 02:28:22 +0000 (02:28 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev
am:
efed517a8a
Change-Id: Ie45ef80d5b9a5307517497bf441dced20dd9062f
TreeHugger Robot [Thu, 4 May 2017 02:23:17 +0000 (02:23 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev
Lorenzo Colitti [Thu, 4 May 2017 02:12:20 +0000 (02:12 +0000)]
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
am:
33b0104cfc
Change-Id: I38a3dfa0dcd17e073b6346dddfdd2d1434035b4a