OSDN Git Service
Doris Ling [Fri, 26 May 2017 20:22:13 +0000 (13:22 -0700)]
Remove the duplicate test case that is added by auto-merge.
Change-Id: I0f2f30eed80ab550c16c64a44407ce0199090550
Fix:
38302246
Test: make RunSettingsRoboTests
Doris Ling [Fri, 26 May 2017 19:46:28 +0000 (19:46 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev am:
dd7912e12f
am:
65dbe820bd
Change-Id: I4ced2b59e73ea155528964e927f7a07ed9d9a63f
Doris Ling [Fri, 26 May 2017 19:42:56 +0000 (19:42 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
am:
dd7912e12f
Change-Id: I343ca041d57d45511bb33d1ef3cd6ceae6c03d40
TreeHugger Robot [Fri, 26 May 2017 19:38:37 +0000 (19:38 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 18:34:13 +0000 (18:34 +0000)]
Merge "Move static search ranking from DatabaseResultLoader to Search Adapter."
TreeHugger Robot [Fri, 26 May 2017 18:10:38 +0000 (18:10 +0000)]
Merge "Reduce flakiess in account preference controller test."
Fan Zhang [Fri, 26 May 2017 16:37:05 +0000 (16:37 +0000)]
Merge "Update logPackageName() to use new MetricsLogger API"
Soroosh Mariooryad [Thu, 25 May 2017 21:15:00 +0000 (14:15 -0700)]
Move static search ranking from DatabaseResultLoader to Search Adapter.
This will avoid unnecessary static ranking if smart ranking is used.
Since loader does not need to provided sorted collection of results,
the loading data type has changed from List<> to Set<>. This will also
faster lookup in the Adapter.
Fixes:
38447799
Test: make RunSettingsRoboTests
Change-Id: I448b29bd4e8700c8ec4b5766cbeab4b3087ae39a
Fan Zhang [Fri, 26 May 2017 16:14:08 +0000 (16:14 +0000)]
Merge "Fix a flaky test."
Julia Reynolds [Fri, 26 May 2017 15:02:40 +0000 (15:02 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev am:
540e8f50e3
am:
166a994a4c
Change-Id: Ide3aeac0c328f08becc693795ef5553fa0c9a281
Julia Reynolds [Fri, 26 May 2017 14:54:11 +0000 (14:54 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev
am:
540e8f50e3
Change-Id: Ic3c932d5307992a3937eea568ac3a7cd493ca8a4
Julia Reynolds [Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev
Suprabh Shukla [Fri, 26 May 2017 01:31:47 +0000 (01:31 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev am:
136a3da4a3
am:
7f550afc37
Change-Id: I9bf4a1d951a8ee6a71fb9f8067d35f5f6877e2e6
Suprabh Shukla [Fri, 26 May 2017 01:18:05 +0000 (01:18 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
am:
136a3da4a3
Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
Fan Zhang [Thu, 25 May 2017 23:27:58 +0000 (23:27 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev am:
5bb87f9f34
am:
e8e23081fa -s ours
Change-Id: Ie872c59887b02dedd73a89a024049226f87496ce
jackqdyulei [Thu, 25 May 2017 23:27:26 +0000 (23:27 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev am:
f68bb7e75c
am:
9a091aaac0 -s ours
Change-Id: Ie46aef992d573f45f308ab659d623f4f3972e04a
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
Fan Zhang [Thu, 25 May 2017 23:16:54 +0000 (23:16 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev
am:
5bb87f9f34
Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d
jackqdyulei [Thu, 25 May 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev
am:
f68bb7e75c
Change-Id: I96a82cc6e02f858fb00501ac122822aa2877cdf6
TreeHugger Robot [Thu, 25 May 2017 22:41:06 +0000 (22:41 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev
Daniel Nishi [Thu, 25 May 2017 22:34:03 +0000 (15:34 -0700)]
Fix a flaky test.
If a test with an initialized fake factory was run before this test, it
passed. If it runs first, though, it would flake. By initializing the
fake factory in the test, it shouldn't flake anymore.
Change-Id: I3ecb7477b6b29d093059f01d5dc0124690fb15b3
Fixes:
62103876
Test: Robotests pass
TreeHugger Robot [Thu, 25 May 2017 21:27:22 +0000 (21:27 +0000)]
Merge "Add logging to default browser preference controller"
Fan Zhang [Thu, 25 May 2017 20:48:22 +0000 (13:48 -0700)]
Update logPackageName() to use new MetricsLogger API
Bug:
38258793
Test: make RunSettingsRoboTests
Change-Id: Id08e5655bdaaf0cabd952b07278cd0daf7b59a3b
TreeHugger Robot [Thu, 25 May 2017 20:37:48 +0000 (20:37 +0000)]
Merge "Show setting for work profile lock screen notification"
Alison Cichowlas [Thu, 25 May 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev am:
ed8b39fe60
am:
a974b8c595
Change-Id: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
Lei Yu [Thu, 25 May 2017 20:21:19 +0000 (20:21 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev am:
1a8c2dd899
am:
9e56dd44cd
Change-Id: Id487b717c57c211f9a80f584bd518b6b5267d480
Fan Zhang [Thu, 25 May 2017 20:17:43 +0000 (13:17 -0700)]
Reduce flakiess in account preference controller test.
The getDrawable method from AuthenticatorHelper randomly fails and
causes test flake. Replaced with a shadow.
Test: rerun robotests
Change-Id: I39afeb9082a35786a05c0e8e5adc337c850ad666
Alison Cichowlas [Thu, 25 May 2017 20:09:22 +0000 (20:09 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev
am:
ed8b39fe60
Change-Id: I51475f91a6e2de11c909169ebc5280b1c0e768b5
Lei Yu [Thu, 25 May 2017 20:07:20 +0000 (20:07 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev
am:
1a8c2dd899
Change-Id: I1daa1c18a7a938c1e6528aaeda2a3a874b2fe028
TreeHugger Robot [Thu, 25 May 2017 20:06:27 +0000 (20:06 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev
Lei Yu [Thu, 25 May 2017 19:51:13 +0000 (19:51 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 19:45:30 +0000 (19:45 +0000)]
Merge "Add setIconContentDescription to EntityHeaderController"
Fan Zhang [Thu, 25 May 2017 19:22:21 +0000 (12:22 -0700)]
Add logging to default browser preference controller
Bug:
38480521
Test: manual
Change-Id: I1b0d389f0aa6cc4c9d1895e4cae4d0561df0f0ca
Fan Zhang [Thu, 25 May 2017 00:24:06 +0000 (17:24 -0700)]
Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix:
62051309
Fix:
62045663
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 25 May 2017 00:24:06 +0000 (17:24 -0700)]
Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
cherry-pick of: ag/
2315314
Bug:
62051309
Bug:
62045663
Test: make RunSettingsRoboTests
Change-Id: I779590e34c1eca2dab5b62dda473cfa4371fc064
Julia Reynolds [Wed, 24 May 2017 20:20:06 +0000 (16:20 -0400)]
Allow some system channels to be blocked
Test: manual
Bug:
38428796
Change-Id: If6853f1d847ade968d2bd3a7454ddce0fdda62f0
jackqdyulei [Tue, 23 May 2017 22:08:24 +0000 (15:08 -0700)]
Sort app list after smeared on screen
Then we could make sure the app list is sorted
Bug:
62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Merged-In: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Philip Quinn [Thu, 25 May 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Add metrics category for the assist gesture settings."
Alison Cichowlas [Wed, 24 May 2017 17:15:27 +0000 (13:15 -0400)]
Update notification settings to match Notification Dot branding.
Bug:
38387970
Test: string changes only, manually verified
Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b
Charles He [Thu, 25 May 2017 12:35:42 +0000 (12:35 +0000)]
Merge "Make failed ConfirmCredential attempts count towards wipe"
TreeHugger Robot [Thu, 25 May 2017 04:43:26 +0000 (04:43 +0000)]
Merge "Add icons to choose lock dialog"
jackqdyulei [Thu, 25 May 2017 04:04:47 +0000 (04:04 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev am:
0a6d61883c
am:
db42779cf1
Change-Id: Ie4db806a166c45a14cd3b8ed69be6405befcb64b
jackqdyulei [Thu, 25 May 2017 04:01:46 +0000 (04:01 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
am:
0a6d61883c
Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea
TreeHugger Robot [Thu, 25 May 2017 03:57:27 +0000 (03:57 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
Fan Zhang [Thu, 25 May 2017 03:28:15 +0000 (03:28 +0000)]
Merge "Recursively remove preference from screen." into oc-dev am:
7731b4244e
am:
4472d8af83
Change-Id: Ie8835c9789d959ce3d75b84b05d711f976bab56e
Fan Zhang [Thu, 25 May 2017 03:25:43 +0000 (03:25 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
am:
7731b4244e
Change-Id: Ib3c637bcb4bbd6ded83f626b1b00dff32f9cb12c
TreeHugger Robot [Thu, 25 May 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
Doris Ling [Thu, 25 May 2017 02:37:59 +0000 (02:37 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev am:
1dead24890
am:
be520a5f34
Change-Id: I31036a30605036e957b421727833b3a9830e4584
Doris Ling [Thu, 25 May 2017 02:34:26 +0000 (02:34 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev
am:
1dead24890
Change-Id: Ic64e4f29c2e7124b3e977acb245f0e3e15f84ff6
TreeHugger Robot [Thu, 25 May 2017 02:25:55 +0000 (02:25 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev
TreeHugger Robot [Thu, 25 May 2017 02:25:39 +0000 (02:25 +0000)]
Merge "Sort app list after smeared on screen"
TreeHugger Robot [Thu, 25 May 2017 02:20:36 +0000 (02:20 +0000)]
Merge "Migrate settings robolectric tests to mockito 2"
TreeHugger Robot [Thu, 25 May 2017 02:13:13 +0000 (02:13 +0000)]
Merge "Set correct uid when loading app icon in data usage UI."
TreeHugger Robot [Thu, 25 May 2017 02:10:34 +0000 (02:10 +0000)]
Merge "Add a flag for the Bluetooth device details page"
TreeHugger Robot [Thu, 25 May 2017 02:04:34 +0000 (02:04 +0000)]
Merge "UI Cleanup on supported links dialog in app info page."
Maurice Lam [Fri, 19 May 2017 22:23:26 +0000 (15:23 -0700)]
Add icons to choose lock dialog
- Add icons to items in choose lock dialog
- Add title to the dialog
- Update the font size and color to match specs
Test: Manual. Existing tests pass
Bug:
38394440
Change-Id: Ie7ed9944b71fa5ca408ec6898f49cbd36865a1dd
Antony Sargent [Wed, 24 May 2017 23:45:18 +0000 (16:45 -0700)]
Add setIconContentDescription to EntityHeaderController
This lets us set a contentDescription on the icon in entity headers
for accessibility.
Bug:
62068874
Test: make RunSettingsRoboTests
Change-Id: I1af7aad34aa65b616cf4edb8b144f315040a9fdd
jackqdyulei [Wed, 24 May 2017 00:01:39 +0000 (17:01 -0700)]
Add NPE check for refreshUi
The reason for NPE is that callback is registered too early, so
one callback is invoked before controller is fully inited. This
cl fix it in two ways:
1. Add NPE check in refreshUi, since this method in InstalledAppDetail
is robost to NPE
2. Move the callback to the end of constructor.
Bug:
37913054
Test: RunSettingsRoboTests
Change-Id: I54b03fb51a958a8e63bfe8a7ccfda79be1fa1956
Doris Ling [Wed, 24 May 2017 20:24:23 +0000 (13:24 -0700)]
Listener to tether state change on Network & internet page.
User can navigates to the page and turn hotspot on or off from the quick
settings. Need to listen to the tether state updates to refresh the
summary for the Hotspot & tethering preference accordingly.
Change-Id: I7c6869b909306b09556e19cf7b7543ce9dcd890e
Fix:
38452559
Test: make RunSettingsRoboTests
Antony Sargent [Wed, 24 May 2017 23:29:22 +0000 (16:29 -0700)]
Add a flag for the Bluetooth device details page
This flag will be used to control whether we use a new, separate page
for Bluetooth device details, or the existing dialog.
Bug:
35877479
Test: make RunSettingsGoogleRoboTests
Change-Id: I2bda77493695ebe3b3bb824657a1422a68918256
Fan Zhang [Wed, 24 May 2017 23:33:08 +0000 (16:33 -0700)]
UI Cleanup on supported links dialog in app info page.
- Simplify layout file
- Increase paddings
Change-Id: I61b7d9315f74172aeb036ef835de73e268329de5
Fix:
62065754
Test: visual
Fan Zhang [Wed, 24 May 2017 23:04:23 +0000 (16:04 -0700)]
Set correct uid when loading app icon in data usage UI.
work profile apps belongs to a different user. Set the correct uid when
loading the icon so the work profile badge is displayed.
Change-Id: I2ed27d6b83c1b42961500dc8d63475bf1f7eabcd
Fix:
38372681
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 24 May 2017 22:51:59 +0000 (22:51 +0000)]
Tether screen cleanup am:
20ae31e87c
am:
a6f821c015
Change-Id: Icaa0173c43b80964aac5d0560e69426536c8da29
Fan Zhang [Wed, 24 May 2017 22:48:55 +0000 (22:48 +0000)]
Tether screen cleanup
am:
20ae31e87c
Change-Id: I5294531666526a05d07db15ff208eedec3504970
Maurice Lam [Wed, 24 May 2017 02:51:36 +0000 (19:51 -0700)]
Migrate settings robolectric tests to mockito 2
- Migrated ArgumentMatcher subclasses to lambdas
- Replaced any() with nullable() where tests were failing
Test: cd tests/robotests && mma
Bug:
38456058
Change-Id: Ice8c39b435c45b87f82dbbd9860e68f235314cf8
Fan Zhang [Wed, 24 May 2017 18:19:52 +0000 (11:19 -0700)]
Recursively remove preference from screen.
The preference framework does not remove pref recursively. So when a
preference is nested in preference hierarchy, it's not safe to simply
call screen.removePreference(). We need to first find its parent and
remove pref from its parent.
Change-Id: Ic7fefa498ed71a8877d862845ddcc2d6d6034a55
Fix:
38507066
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 4 May 2017 18:28:16 +0000 (11:28 -0700)]
Tether screen cleanup
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference
Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix:
37518463
Test: visual
(cherry picked from commit
d80117dcea2ae386dea238ae760a12f8004f4b4c)
Phil Weaver [Wed, 24 May 2017 19:37:38 +0000 (19:37 +0000)]
Merge "Follow O patterns for a11y settings"
jackqdyulei [Wed, 24 May 2017 19:31:14 +0000 (19:31 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev am:
a935b3c030
am:
4516644b46 -s ours
Change-Id: Id2468f81d36e890897d60b6eda3f50c5c162203c
jackqdyulei [Wed, 24 May 2017 19:26:16 +0000 (19:26 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev
am:
a935b3c030
Change-Id: I969c301888aca43b5e2154fc86dd139ebb83c3f3
TreeHugger Robot [Wed, 24 May 2017 19:19:54 +0000 (19:19 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 19:08:47 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Phil Weaver [Mon, 22 May 2017 23:57:11 +0000 (16:57 -0700)]
Follow O patterns for a11y settings
Move the summary for the toggled features to a footer.
Make the settings appear as a preference.
Bug:
36780887
Test: Start settings and observe the new UI looks a lot
like the mocks referenced in the bug. Also added unit
test to verify that summary text shows up.
Change-Id: I1d002b194991d0901ecb27198ba5de73bd23a5a9
jackqdyulei [Fri, 19 May 2017 21:42:24 +0000 (14:42 -0700)]
Add background activity action
Background activity action is designed for wakeup alarm anomaly.
This cl also change the parameter in anomaly action interface
from "packageName" to "anomaly"
Bug:
36921529
Test: RunSettingsRoboTests
Change-Id: Ibde69f351f81043641f228f0e74deaa2e230c08a
Matthew Fritze [Wed, 24 May 2017 17:18:58 +0000 (17:18 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev am:
ae0886c9f7
am:
934a04509f
Change-Id: Iff239e99df07cf425f650fbdb9cfb72a3fc40182
Matthew Fritze [Wed, 24 May 2017 17:16:01 +0000 (17:16 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
am:
ae0886c9f7
Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
TreeHugger Robot [Wed, 24 May 2017 17:12:34 +0000 (17:12 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
jackqdyulei [Mon, 22 May 2017 22:40:19 +0000 (15:40 -0700)]
Make "Battery usage" accessible at any time
Before this cl, user could go to "Battery usage" page only if
related app has battery usage. This cl breaks this rule so we
could open "Battery usage" without battery data.
Bug:
38497822
Test: RunSettingsRoboTests
Merged-In: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Tony Mak [Wed, 24 May 2017 10:56:22 +0000 (10:56 +0000)]
Merge "Show app battery usage in correct user" into oc-dev am:
7226c9f4c4
am:
f7c007b2c1 -s ours
Change-Id: I77d663cdd0c9dc6a3a411789591421a238a76766
Tony Mak [Wed, 24 May 2017 10:53:25 +0000 (10:53 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
am:
7226c9f4c4
Change-Id: I719a19c92d9671e471b648aa6db9881dbd01ad30
TreeHugger Robot [Wed, 24 May 2017 10:49:11 +0000 (10:49 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 04:48:41 +0000 (04:48 +0000)]
Merge "Update Settings search result unique ids"
jackqdyulei [Wed, 24 May 2017 01:40:32 +0000 (01:40 +0000)]
Merge "Split loading process for battery header" into oc-dev am:
987ee5338a
am:
c0351e0243 -s ours
Change-Id: Ia38ba8d7710511d740d4427674dd9f8f1a917abf
jackqdyulei [Wed, 24 May 2017 01:33:01 +0000 (01:33 +0000)]
Merge "Split loading process for battery header" into oc-dev
am:
987ee5338a
Change-Id: I395b493338f0225bd300e155d3303a1ba9136555
TreeHugger Robot [Wed, 24 May 2017 01:25:13 +0000 (01:25 +0000)]
Merge "Misc fixes to search and UI."
TreeHugger Robot [Wed, 24 May 2017 01:22:23 +0000 (01:22 +0000)]
Merge "Split loading process for battery header" into oc-dev
jackqdyulei [Wed, 24 May 2017 01:01:41 +0000 (01:01 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev am:
4e0f69c10c
am:
6870de6772
Change-Id: I184acec76978463b3d62a6eedadd456ee6fa7a89
jackqdyulei [Wed, 24 May 2017 00:54:40 +0000 (00:54 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
am:
4e0f69c10c
Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
TreeHugger Robot [Wed, 24 May 2017 00:49:48 +0000 (00:49 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
jackqdyulei [Tue, 23 May 2017 22:08:24 +0000 (15:08 -0700)]
Sort app list after smeared on screen
Then we could make sure the app list is sorted
Bug:
62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Suprabh Shukla [Wed, 24 May 2017 00:03:37 +0000 (00:03 +0000)]
Revert "Adding SecureTouchListener to DeviceAdminAdd"
This reverts commit
c1f10cb9c6f4188b2b6b95fa35b8c2a584ff55cb.
Bug:
35056974,
38306660
Change-Id: I42b8e60f05f57aad1d8851268a6b40dd295d219b
Bill Yi [Wed, 24 May 2017 00:25:46 +0000 (00:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
20748da300 -s ours
am:
d327ad395b -s ours
Change-Id: I2b8b6ab846ae003a25695289b448dce7a2374bbe
Bill Yi [Wed, 24 May 2017 00:19:39 +0000 (00:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
20748da300 -s ours
Change-Id: Ife6fcaa53d906080248b0cb63e8a32ae3a373793
TreeHugger Robot [Wed, 24 May 2017 00:10:58 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 23:29:25 +0000 (23:29 +0000)]
Merge "Center icons in Settings homepage and search result page."
Lei Yu [Tue, 23 May 2017 23:24:30 +0000 (23:24 +0000)]
Merge "Make "Battery usage" accessible at any time"
jackqdyulei [Fri, 19 May 2017 20:29:09 +0000 (13:29 -0700)]
Split loading process for battery header
This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.
This is the best we can do to avoid ui flashing while removing the
animation
Bug:
38349587
Test: RunSettingsRoboTests
Merged-In: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Lei Yu [Tue, 23 May 2017 23:20:53 +0000 (23:20 +0000)]
Merge "Split loading process for battery header"
jackqdyulei [Tue, 23 May 2017 22:35:54 +0000 (15:35 -0700)]
Turn on power accounting in AOSP
Bug:
38328724
Test: RunSettingsRoboTests
Change-Id: Ibb2691ffdf8581549a1e99f94a8dbaa849453742