Esteban Talavera
c62ce670c3
Merge "Include disabled managed profiles in Accounts page" into oc-dev am: 92f78354f9
...
am: 42d97f86c2
2017-06-02 08:42:50 +00: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
5692d23042
Merge changes from topic 'wifi_detail_jank' into oc-dev am: 0187221bd8
...
am: cc347f4e14
2017-06-02 06:27:13 +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
700369444a
Volume can not be updated in Sound¬ification am: 8c329af634
...
am: d453911e27
2017-06-02 04:32:10 +00:00
Sheng Wang
d453911e27
Volume can not be updated in Sound¬ification
...
am: 8c329af634
2017-06-02 04:29:05 +00:00
TreeHugger Robot
d2cf668700
Merge "Make BatterySettings Asynchronous and use enhanced estimate"
2017-06-02 02:48:23 +00:00
TreeHugger Robot
27fffa4cd9
Merge "Update string for recent apps."
2017-06-02 02:39:31 +00:00
TreeHugger Robot
683a3bf4eb
Merge "Check for null mReadOnlyApnTypes."
2017-06-02 01:18:22 +00:00
Salvador Martinez
9cfa7720f4
Make BatterySettings Asynchronous and use enhanced estimate
...
this CL changes BatteryInfo methods to all use the async style
callback approach it had for one of the methods. Non-async methods
are now annotated to only be used in worker threads. BatteryInfo
can now be obtained via callback by calling one of the async
methods. Alternatively if there is a worker thread available
the synchronous methods similar to the old ones can be used.
The callback methods have all been changed so that they cascade to a
async method that takes all the required info as paremeters. This
will minimize the amount of churn in files that currently use
BatteryInfo.
A new loader was created that can be used to get BatteryInfo in
places that wish to get it. This loader is used in
PowerUsageSummary to get the BatteryInfo.
Test: Robotests
Bug: 38399275
Bug: 38398949
Bug: 38399654
Change-Id: Ic5a82d8ca4c85fad1b883226327ec083badf861d
2017-06-01 18:03:53 -07:00
Doris Ling
2c80b4fc3a
Update string for recent apps.
...
Bug: 62273254
Test: builds
Change-Id: I57a06b4bdfaa9c41636baeddcb94c71bf4518ebc
2017-06-01 17:58:04 -07:00
Sheng Wang
fd1a02d914
Merge "Volume can not be updated in Sound¬ification" am: c0fdbab185 am: 161e3d14e1 am: 9dbd34a3d9
...
am: 61a420df95
2017-06-02 00:57:09 +00:00
TreeHugger Robot
db42c2650d
Merge "Don't index High usage summary"
2017-06-02 00:41:12 +00:00
TreeHugger Robot
ec3e297453
Merge "Restart loader in onResume"
2017-06-02 00:32:23 +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
Sheng Wang
161e3d14e1
Merge "Volume can not be updated in Sound¬ification"
...
am: c0fdbab185
2017-06-02 00:21:45 +00:00
Treehugger Robot
c0fdbab185
Merge "Volume can not be updated in Sound¬ification"
2017-06-02 00:14:16 +00:00
Amit Mahajan
7243db2572
Check for null mReadOnlyApnTypes.
...
Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
2017-06-01 16:39:40 -07:00
TreeHugger Robot
31d5b3de6f
Merge "Add strings in battery usage page"
2017-06-01 23:38:43 +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
TreeHugger Robot
34494a53c9
Merge "Add group name into channel summary, if applicable."
2017-06-01 22:57:26 +00:00
jackqdyulei
210110f4ed
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
2017-06-01 15:57:08 -07:00
TreeHugger Robot
8da7a39697
Merge "Update strings for anomaly detection"
2017-06-01 22:46:12 +00:00
Andrew Sapperstein
5a804c105f
Merge "Add search bar to SearchActivity." into oc-dev am: fbc9035bcd
...
am: 0a35757003
2017-06-01 22:28:08 +00: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
TreeHugger Robot
8d9177a06e
Merge "Hide saved network preference when there is none."
2017-06-01 21:41:39 +00:00
jackqdyulei
040c21bcb5
Add strings in battery usage page
...
Add prefix:
1. "Used for" for foreground time
2. "Active for" for background time
Bug: 37162357
Test: RunSettingsRoboTests
Change-Id: Ifd4762640bd5ad98ce64ab174f7a7f44dbb1aa27
2017-06-01 14:38:00 -07:00
Matthew Fritze
5baaa7aef9
Merge "Prevent crash when removing duplicates" into oc-dev am: 7a148b9e09
...
am: 752b18191b
2017-06-01 21:29:35 +00: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
Alison Cichowlas
8ad2fa6865
Add group name into channel summary, if applicable.
...
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.
Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-06-01 17:04:36 -04:00
Fan Zhang
396938f29b
Merge "Add method to disable "disable" button in installed app UI" into oc-dev am: e12790e34f
...
am: 7d190dd69d
2017-06-01 20:34:53 +00:00
Andrew Sapperstein
c0a9fe9926
Merge "Initial search bar implementation." into oc-dev am: 91fe76263f
...
am: 9448f68171
2017-06-01 20:28:37 +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
TreeHugger Robot
f43f4c3131
Merge "Move BatteryInfo to settings from settingslib"
2017-06-01 20:16:42 +00:00
xudiwen
52c031edae
Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01 am: 957c4d7720 am: 0ff0487b51
...
am: ecfbe17684
2017-06-01 20:02:14 +00:00
Andrew Sapperstein
9448f68171
Merge "Initial search bar implementation." into oc-dev
...
am: 91fe76263f
2017-06-01 20:01:49 +00:00
jackqdyulei
3e36c649c5
Merge "Add method to calculate last full charge time" into oc-dev am: d4991dc24d
...
am: 42790ccd84
2017-06-01 20:01:42 +00:00
TreeHugger Robot
ee8ac88f82
Merge "Add search bar to SearchActivity."
2017-06-01 19:57:20 +00:00
Andrew Sapperstein
91fe76263f
Merge "Initial search bar implementation." into oc-dev
2017-06-01 19:52:07 +00:00
Fan Zhang
015c7706e4
Hide saved network preference when there is none.
...
We already do this when wifi is enabled. This change brings same
behavior when wifi is off.
Change-Id: I44301fe46a6183735f8be71c80cfe719ad0e82b4
Fix: 62094681
Test: runtest --path tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
2017-06-01 12:38:08 -07:00
TreeHugger Robot
b42162c819
Merge "Pass component name into SuggestionFeatureProvider"
2017-06-01 19:33:29 +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
