OSDN Git Service
Tony Mantler [Fri, 26 May 2017 20:34:14 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
Lei Yu [Fri, 2 Jun 2017 19:21:27 +0000 (19:21 +0000)]
Merge "Restart loader in onResume" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 18:42:24 +0000 (18:42 +0000)]
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
jackqdyulei [Thu, 1 Jun 2017 01:03:09 +0000 (18:03 -0700)]
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
Lei Yu [Fri, 2 Jun 2017 17:08:43 +0000 (17:08 +0000)]
Merge "Refine the ProgressCategory" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 15:39:44 +0000 (15:39 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev
Bartosz Fabianowski [Thu, 18 May 2017 09:46:38 +0000 (11:46 +0200)]
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
Esteban Talavera [Fri, 2 Jun 2017 08:33:16 +0000 (08:33 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 06:11:51 +0000 (06:11 +0000)]
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.
Sheng Wang [Fri, 19 Aug 2016 09:09:32 +0000 (17:09 +0800)]
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
jackqdyulei [Thu, 1 Jun 2017 22:46:21 +0000 (15:46 -0700)]
Refine the ProgressCategory
1. Make the progressbar align with settings gear
2. Make text vertical center
Bug:
37190885
Test: Screenshot
Change-Id: Ib69b949179a0e097b78717cbe93c39aa0064ea9e
TreeHugger Robot [Thu, 1 Jun 2017 22:02:31 +0000 (22:02 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 21:12:10 +0000 (21:12 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 20:24:05 +0000 (20:24 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
Alison Cichowlas [Thu, 1 Jun 2017 20:07:32 +0000 (16:07 -0400)]
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
Andrew Sapperstein [Thu, 1 Jun 2017 19:52:06 +0000 (19:52 +0000)]
Merge "Initial search bar implementation." into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
Matthew Fritze [Tue, 30 May 2017 15:36:52 +0000 (08:36 -0700)]
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
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
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
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
Alison Cichowlas [Wed, 31 May 2017 21:01:24 +0000 (17:01 -0400)]
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
Esteban Talavera [Tue, 30 May 2017 15:48:08 +0000 (16:48 +0100)]
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
TreeHugger Robot [Thu, 1 Jun 2017 08:09:51 +0000 (08:09 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
Lorenzo Colitti [Tue, 2 May 2017 03:06:32 +0000 (12:06 +0900)]
Reduce jank in the wifi detail status page.
Currently, when anything changes, the wifi detail status page
removes and then redraws all IP address information. This causes
the whole screen to flicker. Instead, only add and remove things
when they actually change.
In order to do this, convert the IPv6 addresses from a list of
Preference objects to a single newline-separated text field.
This removes the need to keep track of addresses as they are
added and deleted, and also looks a bit better.
Also, minor correctness fixes:
- Get the gateway from the default route, not from the last route
with a non-null gateway.
- Get the IPv4 subnet mask from the IPv4 address prefix, not from
the last route with prefix length > 0.
Bug:
62171690
Test: make -j64 RunSettingsRoboTests
Test: IP information does not flicker when signal strength changes
Change-Id: Ia9f2a277e53a2800407ae327701c5b95a9eec20a
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:47:42 +0000 (22:47 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
Andrew Sapperstein [Sun, 28 May 2017 19:20:10 +0000 (12:20 -0700)]
Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.
Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.
Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.
Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).
Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
when there's a condition
Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug:
37477506
Test: make RunSettingsRoboTests
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
Fan Zhang [Wed, 31 May 2017 17:42:19 +0000 (10:42 -0700)]
Add method to disable "disable" button in installed app UI
OEMs can now force grey out the "disable" button for important apps on
device.
Change-Id: I8ea431b52e50e424be55946f70175db5412e2f4a
Merged-In: Ic075a07ad12592bd60238c7b1c9ab84932c8db3c
Fix:
38250742
Test: make RunSettingsRoboTests
Alison Cichowlas [Tue, 30 May 2017 12:48:59 +0000 (08:48 -0400)]
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
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
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 :)
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
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
Lorenzo Colitti [Tue, 2 May 2017 03:06:32 +0000 (12:06 +0900)]
Improve testing of IP address display code.
This is a test-only change whose goal is to increase our
confidence in future changes that touch the actual code.
Bug:
62171690
Test: make -j64 RunSettingsRoboTests
Change-Id: Ic5122453c9fec2b166fcfe0c5c33be2705c10906
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: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:02:09 +0000 (23:02 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
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
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: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
jackqdyulei [Thu, 25 May 2017 22:26:03 +0000 (15:26 -0700)]
Add method to calculate last full charge time
Bug:
38481300
Test: RunSettingsRoboTests
Change-Id: Icd551921f263352eb01d0c6ada62d277c8699507
Christine Franks [Fri, 26 May 2017 20:12:24 +0000 (20:12 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
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:39:26 +0000 (14:39 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
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
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
TreeHugger Robot [Thu, 25 May 2017 03:57:27 +0000 (03:57 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
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 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)
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 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
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 01:22:23 +0000 (01:22 +0000)]
Merge "Split loading process for battery header" into oc-dev
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
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
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
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:35:14 +0000 (17:35 +0000)]
Merge "Fix storage summary background colors." into oc-dev
Felipe Leme [Thu, 18 May 2017 21:32:13 +0000 (14:32 -0700)]
Refactored ConfirmationDialogFragment to use default construcutor.
Test: manual verification
Test: make RunSettingsRoboTests -j90
Fixes:
38397850
Change-Id: Ie724e7e92a6a34d4db16e4406bf821f00d98d180
TreeHugger Robot [Tue, 23 May 2017 15:18:06 +0000 (15:18 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev
Tony Mak [Mon, 22 May 2017 13:22:57 +0000 (14:22 +0100)]
Show app battery usage in correct user
Test: m -j RunSettingsRoboTests
Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
Merged-In: I6c0f74b79468ee670f642edb0a50400c030d1925
Fix:
38447829
Lei Yu [Tue, 23 May 2017 06:16:43 +0000 (06:16 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
jackqdyulei [Mon, 22 May 2017 21:23:37 +0000 (14:23 -0700)]
Use BatteryStatsLoader in InstalledAppDetails
InstalledAppDetails uses AsyncTask to update foreground mBatteryStatsHelper
in background thread, which is dangerous. This cl make
InstalledAppDetails use BatteryStatsLoader to update batteryStatsHelper
and only assign it once in UI thread.
Bug:
38497555
Test: RunSettingsRoboTests
Change-Id: I3078b60a2dae36995ae5f925b4d49e36e79bddfd
Lei Yu [Fri, 19 May 2017 17:47:44 +0000 (17:47 +0000)]
Revert "Add animation for battery asyncLoader."
This reverts commit
a3c528f64db7aa96c258bdc2f6dad0a8d6897461.
Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Merged-In: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134