OSDN Git Service
Daniel Nishi [Thu, 1 Jun 2017 17:42:55 +0000 (17:42 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
am:
7035a41715
Change-Id: I2c465b9561cea69e5772efd08af7794f762758ca
Daniel Nishi [Thu, 1 Jun 2017 17:30:32 +0000 (17:30 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
Kevin Chyn [Thu, 1 Jun 2017 08:17:06 +0000 (08:17 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
am:
98b67a4e94
Change-Id: Ic3497ccbd63ba4e56ad1923f6b4d082e78c95b70
TreeHugger Robot [Thu, 1 Jun 2017 08:09:51 +0000 (08:09 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
Kevin Chyn [Thu, 1 Jun 2017 00:11:03 +0000 (17:11 -0700)]
Add onResume to FingerprintEnrollEnrolling
Fixes:
62233947
Test: revoke usb permissions, start enrolling, attach usb,
press ok, continue enroll. enroll should be able to continue
and complete
onPause was added in b/
38102355, but onResume was not added. We should
set the listener in onResume()
Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
Christine Franks [Wed, 31 May 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
am:
9ef166a578
Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992
Christine Franks [Wed, 31 May 2017 22:47:42 +0000 (22:47 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
Matthew Fritze [Wed, 31 May 2017 22:47:27 +0000 (22:47 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
am:
564d90faf0
Change-Id: I91993bdbf7de1256fb8149478126ec507833611b
TreeHugger Robot [Wed, 31 May 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
Joe Onorato [Wed, 31 May 2017 19:50:03 +0000 (19:50 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
am:
37eb1c580b
Change-Id: Ia794a4e1d51a6a0a28b65f9ade1530ca2c79cf90
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
Christine Franks [Sat, 27 May 2017 01:23:38 +0000 (18:23 -0700)]
Allow FR in carrier demo mode
Bug:
62133292
Test: make RunSettingsRoboTests -j100, and manually verified FR is
available in carrier demo mode.
Change-Id: Ia793bf234b229da0490accfea6d44b72395a04bc
Bill Yi [Wed, 31 May 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
76e9bd72f9 -s ours
Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f
TreeHugger Robot [Wed, 31 May 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Daniel Nishi [Wed, 31 May 2017 17:59:04 +0000 (10:59 -0700)]
Fix a bug where cache was double-counted.
Cache was being counted as cache and also as data in the app info page.
This is due to a faulty assumption I made that getDataBytes() and
getCacheBytes() measured distinct areas of storage (in actuality,
getCacheBytes() is a subset of getDataBytes()). This improper assumption
also led to the unit test being incorrect.
Change-Id: I4144d50800f82feaecb7a0a8dff26be3e4f14da8
Fixes:
62182151
Test: Settings robotest & manual
Matthew Fritze [Wed, 31 May 2017 16:38:02 +0000 (09:38 -0700)]
Remove dynamic summary from Security Patch info
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes:
36101902
Test: builds :)
Jeff Sharkey [Wed, 31 May 2017 14:48:43 +0000 (14:48 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
am:
552e3c4dba
Change-Id: I70e8a1aac274f6a96626272127d5dab060e10966
Bill Yi [Wed, 31 May 2017 14:24:59 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26a4e18c3186ee2388da40e2bf1232314f944813
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 31 May 2017 14:18:24 +0000 (14:18 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
Esteban Talavera [Wed, 31 May 2017 12:04:57 +0000 (12:04 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
am:
535533680f
Change-Id: I9058ae475e16c3b3c3227aa979af78c8958d0628
TreeHugger Robot [Wed, 31 May 2017 11:58:38 +0000 (11:58 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
Jeff Sharkey [Tue, 30 May 2017 20:39:14 +0000 (14:39 -0600)]
Consistent "low storage" behavior.
Fix several bugs related to storage accounting. Since getDataBytes()
already includes cached data, we need to subtract it to avoid blaming
apps for it.
We also need to blame app code on someone, so we blame it on the
current user. StorageStatsManager was fixed awhile back to only
return the app code size on the requested storage volume, so we can
remove the system app checks.
Subtract "appBytes" from external storage accounting, since it's
already been blamed elsewhere against specific apps.
Pass along storage results from all users on the device, and subtract
them all when estimating size of "system" data. To avoid embarrassing
estimation bugs, make sure that "system" data is at least 1GB.
Bug:
38008706
Test: cts-tradefed run commandAndExit cts-dev -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.StorageConstraintTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: Ide1e6d0690e5ad4e751c87891f63ba1036434619
Hugo Benichi [Wed, 31 May 2017 00:27:43 +0000 (00:27 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
am:
0c5573a0e3
Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
Hugo Benichi [Wed, 31 May 2017 00:16:41 +0000 (00:16 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
Suprabh Shukla [Tue, 30 May 2017 23:12:10 +0000 (23:12 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
am:
dacdcb9b42
Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5
Suprabh Shukla [Tue, 30 May 2017 23:02:09 +0000 (23:02 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
Rebecca Silberstein [Tue, 30 May 2017 22:02:18 +0000 (22:02 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
am:
bbc260d408
Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d
Phil Weaver [Tue, 30 May 2017 22:01:40 +0000 (22:01 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
am:
7348c5c91b
Change-Id: I3244c4cd41919e691641f9696f1f2c24f3c07bcd
Rebecca Silberstein [Tue, 30 May 2017 21:48:36 +0000 (21:48 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
Phil Weaver [Tue, 30 May 2017 21:45:36 +0000 (21:45 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
Matthew Fritze [Tue, 30 May 2017 20:38:57 +0000 (20:38 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
am:
fed6e817a5
Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
TreeHugger Robot [Tue, 30 May 2017 20:24:22 +0000 (20:24 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
Daniel Nishi [Tue, 30 May 2017 19:50:21 +0000 (19:50 +0000)]
Merge "Fix an override filter bug." into oc-dev
am:
5cc0a122d3
Change-Id: I9188da01862ae2af964ac09b84f5b3c6078572cc
Daniel Nishi [Tue, 30 May 2017 19:44:36 +0000 (19:44 +0000)]
Merge "Fix an override filter bug." into oc-dev
Rebecca Silberstein [Thu, 25 May 2017 09:50:29 +0000 (02:50 -0700)]
SettingsAppWidgetProvider: do not use setWifiApEnabled
Calls to stop tethering should use stopTethering instead of
setWifiApEnabled.
Bug:
38017909
Test: manual
Change-Id: Ib43f8c29b190ba7bad9c5b2d6a01bc9558110890
Phil Weaver [Fri, 26 May 2017 00:02:21 +0000 (17:02 -0700)]
Fix clickjacking again for accessibility services
Turns out that the flag for the window being obscured
does not imply that it is also partially obscured.
Also blocking system alerts and toast windows over the
accessibility service preference screen (and its associated
warning dialog) as well as the warning dialog shown when
a service is made available with the accessibiity shortcut.
Bug:
62104030
Test: Manually verified that I can't enable Select to Speak
when switch access is highlighting the button. I am able to
do that without this fix. Also started a service that
displayed a system overlay and confirmed that the overlay
disappears on a11y service preference screens and when a
new service is configured for the a11y shortcut.
Merged-In: Ie00bafa736c837881a258c9de10891b27c5baefd
Change-Id: Iabbded1a12dbc33d76e51c0bac710280a88080f3
Matthew Fritze [Tue, 30 May 2017 16:58:55 +0000 (09:58 -0700)]
Location summary is no longer indexed
Change-Id: I794e52b2f18e6e79033fbdaf2643209714b88025
Fixes:
38254258
Test: Search "mode" -> no summary text
Esteban Talavera [Thu, 25 May 2017 10:23:04 +0000 (11:23 +0100)]
Launchers that don't support managed profiles cannot be selected
If there is a managed profile, launchers that don't support managed profiles
cannot be selected as default Home
Change-Id: I7a19b5951402ec87a48464d783a539a607adabfe
Fix:
62013411
Test: m RunSettingsRoboTests
Hugo Benichi [Fri, 26 May 2017 06:45:03 +0000 (15:45 +0900)]
Wifi details page: sign-in uses primary color
Test: tested with nearby captive portals
Bug:
36203355
Bug:
36656914
Change-Id: I726f1226862150ba6875c20f919df91ca8043335
Suprabh Shukla [Mon, 22 May 2017 22:20:06 +0000 (15:20 -0700)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Christine Franks [Fri, 26 May 2017 20:18:28 +0000 (20:18 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
am:
532a88dcd0
Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
Christine Franks [Fri, 26 May 2017 20:12:24 +0000 (20:12 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
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
Christine Franks [Fri, 26 May 2017 17:24:45 +0000 (10:24 -0700)]
Align settings seekbar to match other preferences
Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.
Bug:
62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.
Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299
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:18:05 +0000 (01:18 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
am:
136a3da4a3
Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
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 [Mon, 22 May 2017 23:33:32 +0000 (16:33 -0700)]
Fix an override filter bug.
The override filter for storage to ensure that we filter by UUID and
user id was designed as an override filter. This worked as long as there
never was any other filters which could be used out of Storage Settings.
It turns out the instant apps filter applies here.
As a result, I've moved these filters into being "composite filters"
which are composed with the primary filter instead of overriding the
primary filter.
Fixes:
35245772
Test: Settings Robotests... but as for the composing part it is
b/
34768986
Change-Id: I6f5acb909568ab02e81187c09fdda9533d635781
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
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
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
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
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: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: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
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
Fan Zhang [Wed, 24 May 2017 22:48:55 +0000 (22:48 +0000)]
Tether screen cleanup
am:
20ae31e87c
Change-Id: I5294531666526a05d07db15ff208eedec3504970
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)
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
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: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
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:22:23 +0000 (01:22 +0000)]
Merge "Split loading process for battery header" into oc-dev
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
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: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
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
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
Matthew Fritze [Tue, 23 May 2017 22:21:18 +0000 (22:21 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
am:
96a8dffafb
Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409
jackqdyulei [Tue, 23 May 2017 21:30:47 +0000 (14:30 -0700)]
Update the strings for "show all apps"
Bug:
38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
TreeHugger Robot [Tue, 23 May 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
Bill Yi [Tue, 23 May 2017 22:05:15 +0000 (15:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82f35157c3d1396be572d690b559ebfb6fa9910f
Auto-generated-cl: translation import
Matthew Fritze [Tue, 23 May 2017 21:02:57 +0000 (21:02 +0000)]
Revert "Revert "Replace dynamic summary text for SettingPref""
This reverts commit
8061aaef621b38e269eaa34c0cfef48a9b7eb288.
Test: make RunSettingsRoboTests
Fixes:
36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
Felipe Leme [Tue, 23 May 2017 20:57:34 +0000 (20:57 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
am:
3cf690e906
Change-Id: Ia76b7b27c3697645b58ee705733211b85a4dca40
TreeHugger Robot [Tue, 23 May 2017 20:44:08 +0000 (20:44 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
Bookatz [Tue, 23 May 2017 18:52:19 +0000 (11:52 -0700)]
Add unoptimized ble scans to batterystats.
Bug:
38461344
Test: see main cl in topic
Change-Id: I426011e1954ef8ae7fae595cbcbe986280b7638f
Matthew Fritze [Thu, 11 May 2017 18:56:27 +0000 (11:56 -0700)]
Remove duplicates in Security Settings
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
Daniel Nishi [Tue, 23 May 2017 17:41:21 +0000 (17:41 +0000)]
Merge "Fix storage summary background colors." into oc-dev
am:
8b8f27cd06
Change-Id: I821d4a44c69bae33e3ae9854f23ed87e51139951
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "Fix storage summary background colors." into oc-dev