OSDN Git Service
Lei Yu [Mon, 19 Jun 2017 21:16:03 +0000 (21:16 +0000)]
Merge "Hook up bt related knobs to AnomalyDetectionPolicy" into oc-dr1-dev
TreeHugger Robot [Mon, 19 Jun 2017 21:13:04 +0000 (21:13 +0000)]
Merge "Add anomaly detector for unoptimized bt scanning" into oc-dr1-dev
jackqdyulei [Thu, 15 Jun 2017 22:30:44 +0000 (15:30 -0700)]
Hook up bt related knobs to AnomalyDetectionPolicy
This cl adds the following knobs:
1. bluetoothScanDetectionEnabled: whether to enable this detector
2. bluetoothScanThreshold: threshold about bt unoptimized scanning
time in background
Also add the default values for these knobs, which are:
1. bluetoothScanDetectionEnabled: true
2. bluetoothScanThreshold: 30 minutes
Bug:
36921532
Test: RunSettingsRoboTests
Change-Id: I7619453ebe3cc3f5a13b3bbd4fbf3b65a1f1d45c
jackqdyulei [Thu, 15 Jun 2017 20:13:09 +0000 (13:13 -0700)]
Add anomaly detector for unoptimized bt scanning
This cl detects bt anomaly by using
BluetoothUnoptimizedScanBackgroundTimer. It will report anomaly
if total duration is longer than threshold.
Future cl will hook up the threshold to server side.
Bug:
36921532
Test: RunSettingsRoboTests
Change-Id: I5d6a42b2d2c4fec94387ca59ba8e6a2f3346d047
Daniel Nishi [Mon, 19 Jun 2017 17:55:28 +0000 (17:55 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
am:
4743423a82
Change-Id: I59630cf77da700cd5a159e11ac6f9818f1303199
Alison Cichowlas [Mon, 19 Jun 2017 17:49:22 +0000 (17:49 +0000)]
Merge "Notification settings update." into oc-dev
am:
e5493808fd -s ours
Change-Id: I43f0d112d2a5bbd57995e42d50f5877e905dfe20
Daniel Nishi [Mon, 19 Jun 2017 17:45:30 +0000 (17:45 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 17:34:39 +0000 (17:34 +0000)]
Merge "Notification settings update." into oc-dev
Lei Yu [Mon, 19 Jun 2017 17:03:28 +0000 (17:03 +0000)]
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
Alison Cichowlas [Fri, 16 Jun 2017 17:56:56 +0000 (13:56 -0400)]
Notification settings update.
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug:
62705435
Test: make RunSettingsRoboTests; manual verification
Merged-In: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Alison Cichowlas [Mon, 19 Jun 2017 15:02:15 +0000 (15:02 +0000)]
Merge "Notification settings update." into oc-dr1-dev
Fan Zhang [Mon, 19 Jun 2017 14:47:33 +0000 (14:47 +0000)]
Merge "Misc fixes for notification" into oc-dev
am:
e3f322dfc7 -s ours
Change-Id: Ifef5d6fe32b61837fb03285cdc46744954b246ad
TreeHugger Robot [Mon, 19 Jun 2017 14:39:18 +0000 (14:39 +0000)]
Merge "Misc fixes for notification" into oc-dev
Alison Cichowlas [Fri, 16 Jun 2017 17:56:56 +0000 (13:56 -0400)]
Notification settings update.
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug:
62705435
Test: make RunSettingsRoboTests; manual verification
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Bill Yi [Sat, 17 Jun 2017 06:14:17 +0000 (06:14 +0000)]
Import translations. DO NOT MERGE
am:
251cbcbcc5 -s ours
Change-Id: Iac1be0f9462447d5935664f5f111a2d721237436
TreeHugger Robot [Sat, 17 Jun 2017 06:00:19 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 17 Jun 2017 00:41:22 +0000 (00:41 +0000)]
Merge "Hide app info button from app notification settings header" into oc-dr1-dev
TreeHugger Robot [Sat, 17 Jun 2017 00:07:38 +0000 (00:07 +0000)]
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
Fan Zhang [Fri, 16 Jun 2017 18:57:14 +0000 (11:57 -0700)]
Hide app info button from app notification settings header
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug:
62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
(cherry picked from commit
5d811c40d3d1cdb5dfa8eada42329f612d8fbff9)
Fan Zhang [Fri, 16 Jun 2017 18:57:14 +0000 (11:57 -0700)]
Misc fixes for notification
- Tweak alignment for footer preference icon and text
- Hide app info button from app notification settings header
Merged-In: I10803e78fe4f30c2d84ec795c343ed660aab7762
Change-Id: Ia95fc30025c042635ad6467c7fde51991b0c47d9
Fix:
62138362
Fix:
62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
TreeHugger Robot [Fri, 16 Jun 2017 22:08:04 +0000 (22:08 +0000)]
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
jackqdyulei [Fri, 2 Jun 2017 01:11:13 +0000 (18:11 -0700)]
Move "Received files" in BluetoothSettings
Move it from menu to preference
Also clean up the code about menu since there is no menu anymore
in BluetoothSettings
Bug:
35876447
Test: RunSettingsRoboTests
Change-Id: I4a3821595a0cc75382f1cf74bcafb3ecc44cc178
Lei Yu [Fri, 16 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Update wakelock detector" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 03:17:18 +0000 (20:17 -0700)]
Make Accessibility settings a SUW suggestion
Make it a suggestion so that SUW can show it during deferred setup
Test: Manual
Bug:
38506169
Change-Id: I03d5d0d7c2e5168b8d3ccccedce74620675865b8
Maurice Lam [Mon, 12 Jun 2017 19:15:40 +0000 (12:15 -0700)]
Make confirm lock screen use the right theme
Test: cd tests/robotests && mma
Bug:
62348472
Change-Id: Ie05c2e6adba8450a1092f0fefcad6b003398de7d
Lei Yu [Fri, 16 Jun 2017 16:55:52 +0000 (16:55 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev
Christine Franks [Fri, 16 Jun 2017 14:36:10 +0000 (14:36 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev
Bill Yi [Fri, 16 Jun 2017 14:12:33 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
Bill Yi [Fri, 16 Jun 2017 14:00:00 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c041b74f7d78f0b69a4c8553118ed069393586e
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 16 Jun 2017 12:55:38 +0000 (12:55 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev
Charles He [Fri, 16 Jun 2017 11:36:05 +0000 (11:36 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit
3bef8ce30a43d068aafd4756dc2db7eb9f869781)
Tony Mak [Fri, 16 Jun 2017 10:55:11 +0000 (10:55 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce -s ours
Change-Id: I90afad3ac35c46c64e801631d36d24750a5858f4
Daniel Nishi [Fri, 16 Jun 2017 00:19:31 +0000 (17:19 -0700)]
Add more sane multi-profile app attribution.
Due to issues w.r.t. attribution across multiple users, we originally
duplicated the previous implementation which zeroed out the sizes. This,
however, caused system bloat due to the change in how we calculate the
system size.
By attributing apps which do not exist in the primary profile to the
first user that shows up with it installed, we can avoid accidentally
attributing it to the system size.
Bug:
62623731
Test: Settings unittest & Settings robotest
Change-Id: I9514c9ecef62ea6270723f62e6bf27c69b75f180
Christine Franks [Thu, 15 Jun 2017 17:04:21 +0000 (10:04 -0700)]
Update Night display icon in Settings
Bug:
62658839
Test: Night display qs tile icon matches the icon used in the Night
display condition in Settings.
Change-Id: Ie319c9c94604dd630d5cf66f114a4de4397c2694
Maurice Lam [Sat, 3 Jun 2017 02:22:53 +0000 (19:22 -0700)]
Allow skipping PIN setup screen
So that setup wizard can show PIN option by default.
Test: Added Robolectric and instrumentation tests
Bug:
38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
(cherry picked from commit
0f897d79f698920f1c0e0c102a7985704ffa196e)
Tony Mak [Mon, 12 Jun 2017 17:31:40 +0000 (18:31 +0100)]
Fix searching work app in settings NO PARTIAL RERUN
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I9c87345478f8df57b151927d8097cd8fd90fbe79
jackqdyulei [Thu, 15 Jun 2017 17:18:00 +0000 (10:18 -0700)]
Update wakelock detector
1. Use new API: getSubTimer().getTotalDurationMsLocked(), which returns
the wakelock running time in the background.
2. Add code to detect whether app is currently holding wakelocks, by
using API: getCurrentDurationMsLocked
Bug:
38233034
Test: RunSettingsRoboTests
Change-Id: If69b751acf5741ff8df2c905642c008a0a2b32e6
jackqdyulei [Tue, 13 Jun 2017 17:17:59 +0000 (10:17 -0700)]
Display anomaly in battery usage page
This cl adds a new parameter, mAnomalies, for
AdvancedPowerUsageDetail.
If it is null, fragment will start AnomalyLoader to detect anomaly.
If not null, just display the anomaly.
Bug:
36925180
Test: RunSettingsRoboTests
Change-Id: I572bc5954c1cdb210d18b6dbe1ab9dba25c0a61f
Charles He [Thu, 15 Jun 2017 09:57:23 +0000 (10:57 +0100)]
Escape apostrophes in ConfirmCredential strings.
Bug:
62648468
Test: none
Change-Id: Idbfa5c9fc1696e1145d2e33e3df89b5518a13c88
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:42 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5 -s ours
Change-Id: I68959f0803cd714d540299ac916616a933594c00
TreeHugger Robot [Thu, 15 Jun 2017 06:30:57 +0000 (06:30 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
MANUAL MERGE of ag/
2398149 to avoid merge conflicts when trying to
submit to oc-dev.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 22:36:04 +0000 (22:36 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:15:33 +0000 (22:15 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
Kevin Chyn [Fri, 9 Jun 2017 20:37:14 +0000 (13:37 -0700)]
Move assist gestures settings to overlay
Bug:
37427306
Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: If2b0ec9a966334a91f090051dee661011bfc0d70
TreeHugger Robot [Tue, 13 Jun 2017 21:36:40 +0000 (21:36 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 00:43:29 +0000 (17:43 -0700)]
Add action active check for anomaly action.
This cl adds the action active check for the following actions:
1. ForceStopAction: check whether app is stopped
2. BackgroundActivityAction: check whether background activity
is turned on
If related action is not active, we won't report anomaly
to users. Future cl will add active check for bluetooth anomaly.
Bug:
62452014
Test: RunSettingsRoboTests
Change-Id: Ib490227f4570accf8ca4840a99bf85a022c42a5b
Alison Cichowlas [Tue, 13 Jun 2017 11:08:32 +0000 (11:08 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
Katsiaryna Naliuka [Mon, 12 Jun 2017 15:37:33 +0000 (17:37 +0200)]
Added support for external tiles to the lockscreen activity
Bug:
62487664
Test: Built and flashed a system image.
Change-Id: I75e42a042f9212e247f02c5523979bcd5ea57baa
TreeHugger Robot [Tue, 13 Jun 2017 09:45:19 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I24da3a236478e91b06710a4065ba29663921f940
TreeHugger Robot [Tue, 13 Jun 2017 08:07:07 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Alison Cichowlas [Tue, 13 Jun 2017 03:04:40 +0000 (23:04 -0400)]
Fix build - fix import of SettingsRobolectricTestRunner.
Test: Only changing imports in test files.
Change-Id: Ib0d1433983da36416b979a0eaa1bb57419150374
Alison Cichowlas [Tue, 13 Jun 2017 01:45:10 +0000 (01:45 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I63c40ae241f6891fa1e6b85a78dc78d2b918ca6d
Bill Yi [Tue, 13 Jun 2017 01:23:15 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
Bill Yi [Tue, 13 Jun 2017 01:16:46 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7690f708e8eef5505a3508bbf7998d9638504920
Auto-generated-cl: translation import
Tarandeep Singh [Mon, 12 Jun 2017 22:32:28 +0000 (15:32 -0700)]
Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput
Both View focus (which is triggered by View.requestFocus()) and IME focus
(which is internally handled inside InputMethodManager), are implemented
as delayed tasks on the UI thread. The goal here is to make sure that
InputMethodManager.showSoftInput() always gets called only after the target
EditText gained IME focus.
This requires some tricks, but is basically a solved problem with
ImeAwareEditText introduced by
I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235. Here we can just reuse it.
Note that ConfirmLockPassword & ChooseLockPassword are the only ones
using ScrollToParentEditText. Latter doesn't call IMM.showSoftInput().
Fixes:
62542157
Test: Verified keyboard still shows-up on the ConfirmLock screen.
Change-Id: I892d639f3cc5d43db553b682d5278b8ce2fe72da
TreeHugger Robot [Tue, 13 Jun 2017 00:13:43 +0000 (00:13 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
Tarandeep Singh [Fri, 9 Jun 2017 23:24:14 +0000 (16:24 -0700)]
Fix keyboard not launching on screen lock settings.
calling requestFocus() on EditText fixes the issue.
Bug:
62344628
Test: manual
Change-Id: If8321cb646dca5882d5a44bd1ec2f66f0f4ec5aa
Maurice Lam [Mon, 12 Jun 2017 18:34:31 +0000 (18:34 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev
Salvador Martinez [Mon, 12 Jun 2017 18:08:56 +0000 (11:08 -0700)]
Increase length of string for pref title
Translators needed a few more characters in a preference that still
had ample space. This cl simply changes the comment to allow for
the requested character count.
Test: Ensure 25 chars fit (screenshot)
Bug:
62433109
Change-Id: I1bd31c969cc4fea8bcfec794a2d8a7b98778853c
Maurice Lam [Sun, 11 Jun 2017 21:13:24 +0000 (14:13 -0700)]
Increase CHAR LIMIT
Test: Existing tests pass
Bug:
62362729
Bug:
62401881
Change-Id: I4416db079d35cfdedd69670eaa92ef62bcacca80
Andrew Sapperstein [Sun, 11 Jun 2017 01:00:45 +0000 (18:00 -0700)]
Update advanced battery screen to use headline font.
Change-Id: I8e70cc8093cccbe67b7c363a60a03f0eb1cda2e5
Fixes:
62507326
Test: robotests
Bill Yi [Sat, 10 Jun 2017 01:36:51 +0000 (18:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cf44e9a52a89c9d4ebdfa3e05897e68e6ea505f
Auto-generated-cl: translation import
jackqdyulei [Fri, 9 Jun 2017 20:29:09 +0000 (13:29 -0700)]
Update dialogs for anomaly
1. Add dialog for background activity action
2. Use new strings in anomaly dialogs
Bug:
62490179
Test: RunSettingsRoboTests
Change-Id: Ide836a4aca939963bd3b15c6d728eed68a6d7f43
Andrew Sapperstein [Fri, 9 Jun 2017 00:27:14 +0000 (17:27 -0700)]
Update SummaryPreference to use config_headlineFontFamily.
Also deleted a couple of unused files.
Change-Id: I42b6f6c79c3a7ba00040d657204830c5a468a2b2
Fixes:
62385826
Test: manual
Daniel Nishi [Fri, 9 Jun 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 17:07:47 +0000 (17:07 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 16:50:55 +0000 (16:50 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev
Andrew Sapperstein [Fri, 9 Jun 2017 02:27:36 +0000 (19:27 -0700)]
Refactor test runner to use static list of resource paths
Previously everything lived in an inner class method of
SettingsRobolectricTestRunner. That method has now been turned into
a static method so that it can be called by other runners.
Bug:
62460102
Test: robotests
Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840
Antony Sargent [Fri, 9 Jun 2017 15:49:10 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13
Antony Sargent [Fri, 9 Jun 2017 15:41:25 +0000 (15:41 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 08:56:17 +0000 (08:56 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 08:34:43 +0000 (08:34 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am:
4f02eebab8 -s ours
Change-Id: I19ee339c025e3db0c26cd323b65db1131980733e
TreeHugger Robot [Fri, 9 Jun 2017 08:29:56 +0000 (08:29 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
jackqdyulei [Thu, 8 Jun 2017 21:26:39 +0000 (14:26 -0700)]
Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings
Handle it in onCreate() and onSaveInstanceState()
Bug:
62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Merged-In: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
TreeHugger Robot [Fri, 9 Jun 2017 04:39:39 +0000 (04:39 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 02:57:46 +0000 (02:57 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
am:
031b90541f
Change-Id: Ia0581b295824b73ef36f931066b883cff51fc0e9
TreeHugger Robot [Fri, 9 Jun 2017 02:54:31 +0000 (02:54 +0000)]
Merge "Use support feature provider to provide intro url." into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 02:53:35 +0000 (02:53 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
Hugo Benichi [Mon, 5 Jun 2017 07:30:37 +0000 (16:30 +0900)]
Instrument sign-in-captive-portal button
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: WifiDetailPreferenceControllerTest updated
Change-Id: I03dbcdd6efbd0d7aaf2ef67d541fceeb6acc2acf
(cherry picked from commit
539211a718125cc894b81ccbb9e5d1f9364912b5)
jackqdyulei [Thu, 8 Jun 2017 21:26:39 +0000 (14:26 -0700)]
Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings
Handle it in onCreate() and onSaveInstanceState()
Bug:
62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Matthew Fritze [Fri, 9 Jun 2017 01:23:39 +0000 (01:23 +0000)]
Merge "Search results always highlight proper results" into oc-dev
am:
2a32cb6a33
Change-Id: I1bc6297cc75aa833184a00598f5930aa3ca114dc
TreeHugger Robot [Fri, 9 Jun 2017 01:19:37 +0000 (01:19 +0000)]
Merge "Search results always highlight proper results" into oc-dev
TreeHugger Robot [Fri, 9 Jun 2017 01:09:24 +0000 (01:09 +0000)]
Merge "Update text for Languages & Input." into oc-dr1-dev
Maurice Lam [Thu, 8 Jun 2017 18:57:40 +0000 (11:57 -0700)]
Add intent action to support page
Test: cd tests/robotests && mma
Bug:
62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
(cherry picked from commit
1bf5454f64572d9dd58897e5c4981d9a91ce98e0)
Maurice Lam [Thu, 8 Jun 2017 03:59:51 +0000 (20:59 -0700)]
Create new category for lock screen redaction
So that we can show it without all the other default setup wizard
only actions.
Test: Manual
Bug:
62278041
Change-Id: Iba8a626b9b6e1ae909b4f6260dae7c0462b92627
(cherry picked from commit
96ae3f82b3645904e97851b97a276745f458b70e)
Daniel Nishi [Fri, 9 Jun 2017 00:19:04 +0000 (00:19 +0000)]
Merge "Update the music files icon." into oc-dev
am:
47c6afde7f
Change-Id: I20505a1958f7639ac91c571371a7555c4f9b9024
TreeHugger Robot [Fri, 9 Jun 2017 00:13:18 +0000 (00:13 +0000)]
Merge "Update the music files icon." into oc-dev
Fan Zhang [Thu, 8 Jun 2017 22:50:18 +0000 (15:50 -0700)]
Use support feature provider to provide intro url.
Change-Id: I3d2493ec8c84fdc61c04fd63537f959fbd589e98
Fix:
62034077
Test: make RunSettingsRoboTests
Matthew Fritze [Wed, 7 Jun 2017 00:14:33 +0000 (17:14 -0700)]
Search results always highlight proper results
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.
This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.
Instead, we calculate index right before we highlight.
Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes:
62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
TreeHugger Robot [Thu, 8 Jun 2017 23:23:00 +0000 (23:23 +0000)]
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
Daniel Nishi [Mon, 5 Jun 2017 22:28:48 +0000 (15:28 -0700)]
Add "Free up space" to the Settings search.
Change-Id: I8e987595adbd3c32de4001527a2a20478686d3e7
Fixes:
62167072
Test: Manual
Bill Yi [Thu, 8 Jun 2017 22:46:57 +0000 (22:46 +0000)]
Import translations. DO NOT MERGE
am:
29a7bce4e5 -s ours
Change-Id: I436ea7a7e5a758581ed5b4e0c6aa0bc3773d702c
jackqdyulei [Wed, 7 Jun 2017 22:56:03 +0000 (15:56 -0700)]
Update subtitle for apps in battery settings
1. If it is a normal app, show "Screen usage TIME"
2. If it is a hidden app, show "TIME"
Note that in this case the item screen will show "TIME"
Bug:
62422404
Test: RunSettingsRoboTests
Change-Id: Ie8d6caf998d18994ac158f0217109c0e5e9f92ba