Thecrazyskull
ecc7355bde
Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd
...
am: 7151be926d
2017-06-04 00:04:25 +00:00
Thecrazyskull
7151be926d
Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1
...
am: 6270dce2cd
2017-06-04 00:00:25 +00:00
Treehugger Robot
46f7199cb1
Merge "ConditionManager: don't crash when trying to add unexpected condition"
2017-06-03 23:49:39 +00:00
Mikhail Malakhov
38382a44b0
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am: c7697e9b8a am: 933cdd5503
...
am: 0730393097
2017-06-03 22:24:50 +00:00
Mikhail Malakhov
0730393097
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am: c7697e9b8a
...
am: 933cdd5503
2017-06-03 22:20:48 +00:00
Treehugger Robot
c7697e9b8a
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
2017-06-03 22:11:13 +00:00
Thecrazyskull
f7791d75bf
ConditionManager: don't crash when trying to add unexpected condition
...
* Instead, just don't add the unexpected condition
Test: none
Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
2017-06-02 22:50:47 +00:00
Peter Qiu
d8895787c9
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
...
am: 7eeca4b052
2017-06-02 20:38:58 +00:00
TreeHugger Robot
7eeca4b052
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
2017-06-02 20:25:20 +00:00
Lei Yu
64c87589c5
Merge "Restart loader in onResume" into oc-dev
...
am: 74ca6aa060
2017-06-02 19:29:09 +00:00
Lei Yu
74ca6aa060
Merge "Restart loader in onResume" into oc-dev
2017-06-02 19:21:29 +00:00
Alison Cichowlas
f62c6372e8
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
...
am: e811873b4e
2017-06-02 18:49:29 +00:00
TreeHugger Robot
e811873b4e
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
2017-06-02 18:42:25 +00:00
jackqdyulei
ee01dcc74a
Restart loader in onResume
...
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader
Bug: 62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
Merged-In: I6f7e1b57b945c92d34587ca24db192600e7f797f
2017-06-02 10:21:32 -07:00
Peter Qiu
1fcb026a3a
wifi: use WifiSavedConfigUtils to retrieve saved configurations
...
Bug: 62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
2017-06-02 17:16:54 +00:00
Alison Cichowlas
5698552021
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
...
am: 3efc502840
2017-06-02 16:56:59 +00:00
TreeHugger Robot
3efc502840
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
2017-06-02 16:46:52 +00:00
Alison Cichowlas
b143e15dd1
Merge "Add group name into channel summary, if applicable." into oc-dev
...
am: 4b29f593f0
2017-06-02 15:48:25 +00:00
Alison Cichowlas
4b29f593f0
Merge "Add group name into channel summary, if applicable." into oc-dev
2017-06-02 15:39:44 +00:00
Bartosz Fabianowski
98b216dc05
Hide "Changes made by your organization's admin" when empty
...
am: 493495452a
2017-06-02 13:30:12 +00:00
Bartosz Fabianowski
493495452a
Hide "Changes made by your organization's admin" when empty
...
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.
Bug: 35912953
Test: m RunSettingsRoboTests
Merged-in: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
Change-Id: I82ca00b757001390f9a517b0c07057bdc49dab20
2017-06-02 13:45:40 +02:00
Esteban Talavera
42d97f86c2
Merge "Include disabled managed profiles in Accounts page" into oc-dev
...
am: 92f78354f9
2017-06-02 08:38:51 +00:00
Esteban Talavera
92f78354f9
Merge "Include disabled managed profiles in Accounts page" into oc-dev
2017-06-02 08:33:17 +00:00
Lorenzo Colitti
cc347f4e14
Merge changes from topic 'wifi_detail_jank' into oc-dev
...
am: 0187221bd8
2017-06-02 06:18:13 +00:00
TreeHugger Robot
0187221bd8
Merge changes from topic 'wifi_detail_jank' into oc-dev
...
* changes:
Reduce jank in the wifi detail status page.
Improve testing of IP address display code.
2017-06-02 06:11:52 +00:00
Sheng Wang
61a420df95
Merge "Volume can not be updated in Sound¬ification" am: c0fdbab185 am: 161e3d14e1
...
am: 9dbd34a3d9
2017-06-02 00:27:56 +00:00
Sheng Wang
9dbd34a3d9
Merge "Volume can not be updated in Sound¬ification" am: c0fdbab185
...
am: 161e3d14e1
2017-06-02 00:25:17 +00:00
Treehugger Robot
c0fdbab185
Merge "Volume can not be updated in Sound¬ification"
2017-06-02 00:14:16 +00:00
Sheng Wang
8c329af634
Volume can not be updated in Sound¬ification
...
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.
To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.
Bug: 37558283
Test: manual, cherrypicking from AOSP
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
2017-06-01 16:35:03 -07:00
Andrew Sapperstein
0a35757003
Merge "Add search bar to SearchActivity." into oc-dev
...
am: fbc9035bcd
2017-06-01 22:17:44 +00:00
TreeHugger Robot
fbc9035bcd
Merge "Add search bar to SearchActivity." into oc-dev
2017-06-01 22:02:32 +00:00
Mikhail Malakhov
bd5729b7dc
Sometime, Settings app crash when AllowBindAppWidgetActivity closing
...
Process: com.android.settings
E AndroidRuntime: java.lang.RuntimeException:
Unable to destroy activity {com.android.settings/
com.android.settings.AllowBindAppWidgetActivity}:
java.lang.IllegalArgumentException: Receiver not registered:
android.app.Activity$1@5817135
Change-Id: I0f8b61f4c1772b43bffd949928ccaafd295f5fac
Signed-off-by: Mikhail Malakhov <malakhv@gmail.com >
2017-06-02 00:38:27 +03:00
Matthew Fritze
752b18191b
Merge "Prevent crash when removing duplicates" into oc-dev
...
am: 7a148b9e09
2017-06-01 21:24:36 +00:00
TreeHugger Robot
7a148b9e09
Merge "Prevent crash when removing duplicates" into oc-dev
2017-06-01 21:12:11 +00:00
Fan Zhang
7d190dd69d
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
...
am: e12790e34f
2017-06-01 20:28:34 +00:00
TreeHugger Robot
e12790e34f
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
2017-06-01 20:24:06 +00:00
Alison Cichowlas
afe44799f7
Delay adding app settings link until data fetch returns,
...
to avoid reordering/visible misplaced "additional settings
in the app" during transition.
Bug: 62051521
Test: manual with transition scale turned to 10x sloooow.
Change-Id: I50666fbcb2a14344bbdbb2f4347c8470edb96619
2017-06-01 16:07:32 -04:00
Andrew Sapperstein
9448f68171
Merge "Initial search bar implementation." into oc-dev
...
am: 91fe76263f
2017-06-01 20:01:49 +00:00
Andrew Sapperstein
91fe76263f
Merge "Initial search bar implementation." into oc-dev
2017-06-01 19:52:07 +00:00
xudiwen
ecfbe17684
Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01 am: 957c4d7720
...
am: 0ff0487b51
2017-06-01 19:09:25 +00:00
jackqdyulei
42790ccd84
Merge "Add method to calculate last full charge time" into oc-dev
...
am: d4991dc24d
2017-06-01 19:05:44 +00:00
xudiwen
0ff0487b51
Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01
...
am: 957c4d7720
2017-06-01 19:05:23 +00:00
TreeHugger Robot
d4991dc24d
Merge "Add method to calculate last full charge time" into oc-dev
2017-06-01 18:55:54 +00:00
Matthew Fritze
ebd80e68ab
Prevent crash when removing duplicates
...
The method that crashes is removed in O-DR, and thus
does not need to be merged down.
Change-Id: If30bd8bd92d578133984f7f35e7ec5288adfc390
Fixes: 62100634
Test: make RunSettingsRoboTests
Merged-In: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
2017-06-01 11:13:37 -07:00
Andrew Sapperstein
fac61b71e5
Add search bar to SearchActivity.
...
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:02:56 -07:00
Daniel Nishi
0a8b12a30a
Merge "Fix a bug where cache was double-counted." into oc-dev
...
am: 7035a41715
2017-06-01 17:42:55 +00:00
Daniel Nishi
7035a41715
Merge "Fix a bug where cache was double-counted." into oc-dev
2017-06-01 17:30:33 +00:00
Alison Cichowlas
9f36db1f4c
Disallow buzz/beep/disturb changes for notifications with locked importance.
...
If mAppRow.lockedImportance (which comes from the whitelist config_nonBlockableNotificationPackages), don't allow sound, vibration, or override dnd to be changed.
Bug: 38480212
Test: manually verified for now
Change-Id: I04aa7f15f2480472ec6ee487472098e81ab3d99f
2017-06-01 10:52:15 -04:00
Esteban Talavera
9b86e9c822
Include disabled managed profiles in Accounts page
...
At the moment we include disabled profiles when deciding
whether the Work section needs to be added, and then only
include enabled ones when searching for the managed profile's
user handle
Change-Id: I96b0c36aad6b9326abc2992fa3309716f5cd1e74
Fix: 62021410
Test: m RunSettingsRoboTests
2017-06-01 09:52:45 +01:00
Kevin Chyn
618467daff
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
...
am: 98b67a4e94
2017-06-01 08:17:06 +00:00
