OSDN Git Service
Beverly [Mon, 8 Jan 2018 21:31:04 +0000 (16:31 -0500)]
Zen Mode messages + calls are ListPreferences (radio button dialog)
Bug:
63077372
Test: ZenModeCallsPreferenceControllerTest
Test: ZenModeMessagesPreferenceControllerTest
Change-Id: I5d2516402b261413c51a1b4eba5153ffadf1459b
TreeHugger Robot [Tue, 9 Jan 2018 22:16:10 +0000 (22:16 +0000)]
Merge "Add wifi metered controls in wifi settings."
TreeHugger Robot [Tue, 9 Jan 2018 22:03:17 +0000 (22:03 +0000)]
Merge "Add smart battery page for battery settings"
jackqdyulei [Thu, 4 Jan 2018 22:55:13 +0000 (14:55 -0800)]
Add wifi metered controls in wifi settings.
1. Add it in wifi detail page
2. Add it in wifi dialog
2. Remove it in "Mobile network" page
Bug:
68030417
Test: RunSettingsRoboTests
Change-Id: I2e001c55f3c6c75a660e429732dfbece97b0ca9e
jackqdyulei [Fri, 5 Jan 2018 22:33:38 +0000 (14:33 -0800)]
Add smart battery page for battery settings
This page contains prefs for smart battery and app restriction.
Bug:
71502850
Test: RunSettingsRoboTests
Change-Id: I194af30cbc7b2496b10098fcb67f1116e0722310
Jeff Sharkey [Tue, 9 Jan 2018 19:27:40 +0000 (19:27 +0000)]
Merge "Add reserved disk GID to critical component."
Beverly Tai [Tue, 9 Jan 2018 19:18:36 +0000 (19:18 +0000)]
Merge "ZenModeBackend gets newest notification policy"
TreeHugger Robot [Tue, 9 Jan 2018 03:16:26 +0000 (03:16 +0000)]
Merge "Improve messaging for enhanced notifications"
Salvador Martinez [Fri, 5 Jan 2018 00:50:02 +0000 (16:50 -0800)]
Improve messaging for enhanced notifications
The message displayed in battery settings will now more accurately
reflect when an estimate is enhanced based on our updated
definition of what that means.
Test: robotests
Bug:
64833846
Change-Id: Id635d78d8f56d10253e22df2705af93f2693db70
TreeHugger Robot [Mon, 8 Jan 2018 23:02:13 +0000 (23:02 +0000)]
Merge "Change title for advanced connected device page"
TreeHugger Robot [Mon, 8 Jan 2018 22:40:21 +0000 (22:40 +0000)]
Merge "Running services: Hide actionbar buttons in overflow menu"
TreeHugger Robot [Mon, 8 Jan 2018 21:51:27 +0000 (21:51 +0000)]
Merge "Whitelist security settings activity v2 for secondary users"
jackqdyulei [Mon, 8 Jan 2018 21:02:42 +0000 (13:02 -0800)]
Change title for advanced connected device page
Fixes:
70959154
Test: Screenshot
Change-Id: I8868d0c36f02ea7f4696854ab3371785d7bd64ec
Fan Zhang [Mon, 8 Jan 2018 20:55:50 +0000 (12:55 -0800)]
Running services: Hide actionbar buttons in overflow menu
Change-Id: Ia3fe67c438613ef7df5bb4c1e44854666131d0bb
Fixes:
70972973
Test: visual
Jack He [Mon, 8 Jan 2018 20:34:53 +0000 (20:34 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am:
80c0656ca6 am:
e34375b88c
am:
dc9b879ef9 -s ours
Change-Id: I7faaf5fb7e1647e13e0c9539c4bfd9580497c9f5
Jack He [Mon, 8 Jan 2018 20:20:47 +0000 (20:20 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am:
80c0656ca6
am:
e34375b88c
Change-Id: Ie9a167aa6310643465238510831eee8cfab34965
Fan Zhang [Mon, 8 Jan 2018 20:16:27 +0000 (12:16 -0800)]
Whitelist security settings activity v2 for secondary users
Change-Id: Ifb555d83d4815eaff7096d9bd368b09f03845b0d
Fixes:
71708028
Test: robotest
TreeHugger Robot [Mon, 8 Jan 2018 18:29:18 +0000 (18:29 +0000)]
Merge "Remove support v1"
Victor Chang [Mon, 8 Jan 2018 11:24:09 +0000 (11:24 +0000)]
Merge "Revert "Don't use framework strings for formatting file sizes""
Jeff Sharkey [Sat, 6 Jan 2018 00:14:37 +0000 (17:14 -0700)]
Add reserved disk GID to critical component.
We recently created a new GID that can be granted to critical system
processes, so that the system is usable enough for the user to free
up disk space used by abusive apps.
Test: builds, boots
Bug:
62024591
Change-Id: I4aff50c26878fceace5692252cac66e56a3aea6d
Jack He [Sat, 6 Jan 2018 17:33:02 +0000 (17:33 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
am:
80c0656ca6
Change-Id: Ifab1cde7af9421ce140c298df295c75e5e9055ed
TreeHugger Robot [Sat, 6 Jan 2018 05:57:23 +0000 (05:57 +0000)]
Merge "Bluetooth MaxConnectedAudioDevices show correct number"
TreeHugger Robot [Sat, 6 Jan 2018 03:31:24 +0000 (03:31 +0000)]
Merge "Add tests for some security setting controllers"
Salvador Martinez [Fri, 5 Jan 2018 18:39:49 +0000 (10:39 -0800)]
Remove support v1
Support v1 is no longer used and we want to keep the codebase clean.
Test: robotests still pass
Bug:
70620533
Change-Id: Ic8af0f34aab510a533bd7a7ec5c059834395baf5
TreeHugger Robot [Sat, 6 Jan 2018 00:15:43 +0000 (00:15 +0000)]
Merge "Add help info at the bottom of the dialog"
Hansong Zhang [Fri, 5 Jan 2018 22:47:26 +0000 (14:47 -0800)]
Bluetooth MaxConnectedAudioDevices show correct number
* When the preference is changed by the user, it will update the UI
* When the Developer options is enabled, it will set the system property
to default number
* Change string "Maximum number of connected Bluetooth audio devices" to
"Maximum connected Bluetooth audio devices" per discussion with Lindsay
Bug:
71603731
Test: m
ROBOTEST_FILTER="BluetoothMaxConnectedAudioDevicesPreferenceControllerTest"
RunSettingsRoboTests -j40
Change-Id: I3e59534585065c84530da73ffded21894c845ce9
Fan Zhang [Fri, 5 Jan 2018 19:18:44 +0000 (11:18 -0800)]
Add tests for some security setting controllers
Bug:
32953042
Test: robotests
Change-Id: Ieab4e6434bbb80313f6d1b25ff1cdea5713038f0
TreeHugger Robot [Fri, 5 Jan 2018 22:47:31 +0000 (22:47 +0000)]
Merge "Remove toggles in battery settings."
jackqdyulei [Thu, 9 Nov 2017 21:09:28 +0000 (13:09 -0800)]
Add help info at the bottom of the dialog
It contains a link to help center
Bug:
68030013
Test: RunSettingsRoboTest
Change-Id: I79260eff35e604fa97cf21c62f58c02f3bbe5cfb
TreeHugger Robot [Fri, 5 Jan 2018 22:11:56 +0000 (22:11 +0000)]
Merge "Add developer menu to select max number of connected audio devices"
Ajay Nadathur [Fri, 5 Jan 2018 21:19:14 +0000 (21:19 +0000)]
Merge "Show 'screen lock options' on all lock screen types"
TreeHugger Robot [Fri, 5 Jan 2018 21:18:17 +0000 (21:18 +0000)]
Merge "Use proper DashboardFragment APIs for SecuritySettingsV2"
Treehugger Robot [Fri, 5 Jan 2018 20:41:01 +0000 (20:41 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
Hansong Zhang [Fri, 5 Jan 2018 00:38:15 +0000 (16:38 -0800)]
Add developer menu to select max number of connected audio devices
The new developer option modifies the system property
"persist.bluetooth.maxconnectedaudiodevices"; it allows testing
multiple connected devices for A2DP, AVRCP, HFP.
Bug:
71603731
Test: Robolectric test
Change-Id: Ie7887065f98193f4f34e0ff4a29959694e417124
Fan Zhang [Wed, 3 Jan 2018 23:02:02 +0000 (15:02 -0800)]
Use proper DashboardFragment APIs for SecuritySettingsV2
Next CL will add tests.
Bug:
32953042
Test: TODO
Change-Id: I0cb0e4eb216d3e9408675486f1cd73ba82d8ca36
Ajay Nadathur [Thu, 4 Jan 2018 21:06:46 +0000 (13:06 -0800)]
Show 'screen lock options' on all lock screen types
bug:
66239135
Test: Manually tested and verified, robo tests updated
Change-Id: I42ae63661b5d5061fea848e2c1e8a0c8943864e4
Ben Lin [Tue, 19 Dec 2017 22:56:52 +0000 (14:56 -0800)]
Add ability to show/hide assist_and_voice_input preference.
This adds a new boolean flag, config_show_assist_and_voice_input, which
when set to false will hide the assist_and_voice_input preference item.
Bug:
62379282
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest
Change-Id: I3bfc84f0fba07cd52679269daadbdcfccd205ff1
Victor Chang [Fri, 5 Jan 2018 11:58:46 +0000 (11:58 +0000)]
Revert "Don't use framework strings for formatting file sizes"
The previous revert ag/
3403198/ is incomplete.
I just learned that "git revert" has memory.
"git revert" re-applied my previous incorrect merge conflict resolution
when I reverted the same change again.
Test: adb shell am instrument -w -e class
com.android.settings.utils.FileSizeFormatterTest
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Test: manual. GB is shown in Settings > Network > data usage > tap at top
Bug:
70050030
Bug:
70005649
Bug:
36994779
Change-Id: Ia56f8aaf9b5048c102b4e480da0e84e90ee51360
jackqdyulei [Tue, 2 Jan 2018 18:44:48 +0000 (10:44 -0800)]
Remove toggles in battery settings.
In Android P, we only show "Battery saver" and "Power management"
in battery settings. So we need to remove other preferences.
Keep "Battery percentage" toggle for now because it is not
cross-listed in other places.
Bug:
71502850
Test: Screenshot
Change-Id: Ia3c919f61239ff71f9343f2bce961aa4b89533c0
TreeHugger Robot [Fri, 5 Jan 2018 02:11:09 +0000 (02:11 +0000)]
Merge "Add a new widget MasterCheckBoxPreference."
TreeHugger Robot [Fri, 5 Jan 2018 01:45:14 +0000 (01:45 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
Jack He [Thu, 7 Dec 2017 23:09:07 +0000 (15:09 -0800)]
Bluetooth: Use "Disable" in-band ringing instead of "Enable"
* Given that in-band ringing is enabled by default on supported devices,
the corresponding development settings should be rephrased from
"Enable in-band ringing" to "Disable in-band ringing" to hint that it
is enabled by default
* This also gets rid of special logic to check that option in
initialization
* Add strings to reflect this change as well
Bug:
65383086
Test: make, try toggling the preference and verify whether in-band
ringing works or not
Change-Id: I29f91c7d12c725b12452ec163b75051ff28f500d
Merged-In: I29f91c7d12c725b12452ec163b75051ff28f500d
TreeHugger Robot [Fri, 5 Jan 2018 00:36:17 +0000 (00:36 +0000)]
Merge "Merge sub pages for lock/unlock into 1 xml."
Doris Ling [Fri, 5 Jan 2018 00:31:07 +0000 (16:31 -0800)]
Add a new widget MasterCheckBoxPreference.
This is similar to the master switch preference, but instead of the
toggle button, it provides a checkbox as the preference widget.
Change-Id: Ic2392f6a828298ab85494e7dd127fd2d787ce121
Fixes:
71603100
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 5 Jan 2018 00:02:48 +0000 (00:02 +0000)]
Merge "Support getDynamicSummary in BasePreferenceController"
Jack He [Thu, 7 Dec 2017 23:09:07 +0000 (15:09 -0800)]
Bluetooth: Use "Disable" in-band ringing instead of "Enable"
* Given that in-band ringing is enabled by default on supported devices,
the corresponding development settings should be rephrased from
"Enable in-band ringing" to "Disable in-band ringing" to hint that it
is enabled by default
* This also gets rid of special logic to check that option in
initialization
* Add strings to reflect this update
* Modify BluetoothInbandRingingPreferenceControllerTest to reflect this
change
Bug:
65383086
Test: make, try toggling the preference and verify whether in-band
ringing works or not, RunSettingsRoboTests
Change-Id: I29f91c7d12c725b12452ec163b75051ff28f500d
Fan Zhang [Wed, 3 Jan 2018 23:02:02 +0000 (15:02 -0800)]
Merge sub pages for lock/unlock into 1 xml.
And create PreferenceControllers for each setting
The page is still pretty janky and controllers are invoked manually.
Next CL will clean these up.
Bug:
32953042
Test: TODO
Change-Id: I1d7478324f5de4fdb464d79f89086f7e79c0ee67
TreeHugger Robot [Thu, 4 Jan 2018 22:57:35 +0000 (22:57 +0000)]
Merge "Add ability to show/hide accessibility_shortcut_preference."
TreeHugger Robot [Thu, 4 Jan 2018 22:45:54 +0000 (22:45 +0000)]
Merge "Disable animation when adjusting font size."
Jeff Sharkey [Thu, 4 Jan 2018 22:25:01 +0000 (22:25 +0000)]
Merge "Unlock all users before moving or migrating."
Matthew Fritze [Wed, 3 Jan 2018 00:39:39 +0000 (16:39 -0800)]
Support getDynamicSummary in BasePreferenceController
Adds dynamic summary getter in relevant BasePreferenceControllers.
Preferece controllers that don't have dynamic summaries or which
are not yet BasePreferenceControllers are not changed right now.
Change-Id: I435ccab7758d90515583fd8ca10a9b1ef0c858b9
Fixes:
71514936
Test: robotests
TreeHugger Robot [Thu, 4 Jan 2018 21:53:21 +0000 (21:53 +0000)]
Merge "Add ability to show/hide items for Special Access."
Doris Ling [Thu, 4 Jan 2018 21:05:46 +0000 (13:05 -0800)]
Disable animation when adjusting font size.
- The fade-in and fade-out animation for transitioning between
different frames in the text preview is very janky. Disable the
animation to get a smoother transition while dragging along the seek
bar.
Change-Id: I201faf8229961ea5fa5fe42efd312290a4af0f30
Fixes:
71569578
Test: visual
Victor Chang [Thu, 4 Jan 2018 17:35:19 +0000 (17:35 +0000)]
Merge "Revert "Don't use framework strings for formatting file sizes""
TreeHugger Robot [Thu, 4 Jan 2018 02:45:27 +0000 (02:45 +0000)]
Merge "Change underlying preferenceControllers to an ArrayMap of Lists."
TreeHugger Robot [Thu, 4 Jan 2018 01:49:38 +0000 (01:49 +0000)]
Merge "Convert trust agent pref list logic to PreferenceController"
Ben Lin [Fri, 22 Dec 2017 01:32:34 +0000 (17:32 -0800)]
Change underlying preferenceControllers to an ArrayMap of Lists.
Previously, DashboardFragment stores preference controllers in an
ArrayMap of <Class, AbstractPreferenceController>. Thus when there are
multiple controllers of same class (ie. multiple
PreferenceCategoryControllers), they cannot be stored simultaneously.
This changes the value to a List so we can store multiple controllers of
the same Class without extraneous sub-classing.
Bug:
70949662
Test: All existing tests still pass.
Added
DashboardFragmentTest#testPreferenceControllerSetter_shouldAddAndNotReplace
and DashboardFragmentTest#updateState_doesNotSkipControllersOfSameClass.
Change-Id: I397e8c91977ea1180d48a3af75dd4058bf1175c0
Ben Lin [Thu, 21 Dec 2017 02:22:49 +0000 (18:22 -0800)]
Add ability to show/hide items for Special Access.
This adds five new boolean flags:
config_show_high_power_apps
config_show_device_administrators
config_show_premium_sms
config_show_data_saver
config_show_enabled_vr_listeners
Which when individually set to false, will hide the respectively item
from "Special Access" in Apps & notifications. It will also hide them
from surfacing in search results.
Bug:
70907131
Test: Updated SpecialAccessSettingsTest, and created:
HighPowerAppsControllerTest
DeviceAdministratorsControllerTest
PremiumSmsControllerTest
DataSaverControllerTest
EnabledVrListenersControllerTest
Change-Id: I5ad58755643e71d4fb71774404ad96c127440ae4
TreeHugger Robot [Wed, 3 Jan 2018 22:35:18 +0000 (22:35 +0000)]
Merge "Update EncryptionStatusPrefController to BasePrefController"
Fan Zhang [Wed, 3 Jan 2018 19:30:14 +0000 (11:30 -0800)]
Convert trust agent pref list logic to PreferenceController
Bug:
32953042
Test: robotests
Change-Id: I1420e90d4910a11fc5837ef2e150c822635b74a5
TreeHugger Robot [Wed, 3 Jan 2018 21:56:32 +0000 (21:56 +0000)]
Merge "Add ability to show/hide Wi-Fi settings, and all related sub-settings."
Ben Lin [Wed, 20 Dec 2017 20:37:10 +0000 (12:37 -0800)]
Add ability to show/hide Wi-Fi settings, and all related sub-settings.
This adds a new boolean flag, config_show_wifi_settings, which when set
to false will hide the "Wi-Fi" page in network & internet (there is no
key value associated with this preference page). It will also hide
nested pages from search results, such as Wi-Fi preferences.
Bug:
62379554
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ConfigureWifiSettingsTest
and
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiSettingsTest
and
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
all pass.
Change-Id: Iedc6bc272e0cb2b561c6bf25968e70f355aaaa8e
TreeHugger Robot [Wed, 3 Jan 2018 19:31:34 +0000 (19:31 +0000)]
Merge "Remove Suggestion v1 code."
TreeHugger Robot [Wed, 3 Jan 2018 18:46:32 +0000 (18:46 +0000)]
Merge "Convert some security setting logic to PreferenceController"
Fan Zhang [Wed, 3 Jan 2018 18:34:12 +0000 (10:34 -0800)]
Update EncryptionStatusPrefController to BasePrefController
Bug:
32953042
Test: robotests
Change-Id: I273d299c433e9886cb09a8527cdb6cdd0d755d0e
Ben Lin [Fri, 15 Dec 2017 22:40:44 +0000 (14:40 -0800)]
Add ability to show/hide accessibility_shortcut_preference.
This adds a new boolean flag,
config_show_accessibility_shortcut_preference, which when set to false
will hide the accessibility shortcut preference item.
Bug:
62387367
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AccessibilitySettingsTest
Change-Id: I3fd941695df1ad89f717f464d2383be909839a3b
TreeHugger Robot [Wed, 3 Jan 2018 16:41:26 +0000 (16:41 +0000)]
Merge "Notification settings updates"
Victor Chang [Wed, 27 Dec 2017 11:41:30 +0000 (11:41 +0000)]
Revert "Don't use framework strings for formatting file sizes"
This reverts commit
ded99003c45545d739a013caf7ca0c6bf7896785.
- Add java import in order to build successfully
- Fix RunSettingsRoboTests
Test: adb shell am instrument -w -e class
com.android.settings.utils.FileSizeFormatterTest
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Bug:
70005649
Bug:
36994779
Change-Id: I1c0ff48c749e9fbb82fd670c27243bd3922ed373
TreeHugger Robot [Wed, 3 Jan 2018 02:02:58 +0000 (02:02 +0000)]
Merge "Fork SecuritySettings page and hide behind a feature flag."
Fan Zhang [Tue, 2 Jan 2018 22:17:40 +0000 (14:17 -0800)]
Convert some security setting logic to PreferenceController
- Manage trust agent
- Show password
- Sim lock
- Screen pinning
Bug:
32953042
Test: robotests
Change-Id: I0c781a505238cae7a6643b701b750ca63a87a8a5
Fan Zhang [Tue, 2 Jan 2018 19:22:36 +0000 (11:22 -0800)]
Remove Suggestion v1 code.
Change-Id: Ie6e9c8f2b1b5b609d44e287accb9fbbef9054d34
Fixes:
68719093
Test: robotests
Fan Zhang [Fri, 22 Dec 2017 17:59:37 +0000 (09:59 -0800)]
Fork SecuritySettings page and hide behind a feature flag.
Bug:
32953042
Test: robotests
Change-Id: Ibbb4221eef87f09ccd024146517707680180a100
Julia Reynolds [Thu, 21 Dec 2017 18:28:20 +0000 (13:28 -0500)]
Notification settings updates
- Text changes
- Show channels on the app settings screen (again)
- Hide most of the channel settings under 'advanced' (note: this hides
the footer preference(s) also, at the moment. the functionality
to exclude those is coming in a later cl)
- Add a 'show notifications' toggle for each app created group
Bug:
63927402
Test: make RunSettingsRoboTests
Change-Id: I9906ef943d05e1915061b59294a25d81c4e6cbb5
Julia Reynolds [Thu, 21 Dec 2017 18:26:39 +0000 (13:26 -0500)]
Allow switchbars to have alternate text
For when On and Off aren't descriptive enough.
Bug:
63927402
Test: make -j20 RunSettingsRoboTests
Change-Id: I1e12d8d92dbe2f0a4c5202667cf1a76f0428e048
TreeHugger Robot [Wed, 27 Dec 2017 23:06:22 +0000 (23:06 +0000)]
Merge "Fix bug in SummaryLoader"
Akiya Utsumi [Wed, 27 Dec 2017 21:52:05 +0000 (21:52 +0000)]
Merge "Fix the format of wifi_carrier_content string" am:
985b432fc0 am:
47ba3b400c
am:
9dffb28afd
Change-Id: I90004b044b4217ad0c102e9afde1f491826d6a4f
Akiya Utsumi [Wed, 27 Dec 2017 21:45:58 +0000 (21:45 +0000)]
Merge "Fix the format of wifi_carrier_content string" am:
985b432fc0
am:
47ba3b400c
Change-Id: I39a694ec83185fa6eb5d13cffa6d0390fe7d568a
Akiya Utsumi [Wed, 27 Dec 2017 21:43:20 +0000 (21:43 +0000)]
Merge "Fix the format of wifi_carrier_content string"
am:
985b432fc0
Change-Id: Ic77ff6da5081cae7a3b7fba31bc4902645188763
Treehugger Robot [Wed, 27 Dec 2017 21:36:40 +0000 (21:36 +0000)]
Merge "Fix the format of wifi_carrier_content string"
TreeHugger Robot [Sat, 23 Dec 2017 00:47:11 +0000 (00:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 22 Dec 2017 23:05:08 +0000 (15:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7e2bf66b896c6fab42a643a7c74535b354b0d94c
Auto-generated-cl: translation import
Lei Yu [Fri, 22 Dec 2017 22:17:28 +0000 (22:17 +0000)]
Merge "Add summary placeholder for bt preference"
jackqdyulei [Fri, 22 Dec 2017 18:25:04 +0000 (10:25 -0800)]
Add summary placeholder for bt preference
Then UI won't be janky(as everything slide down a little bit)
Bug:
63910184
Test: RunSettingsRoboTests
Change-Id: Ie4074694f54af92da52f09d2caaab5490fa73647
Akiya Utsumi [Tue, 31 Oct 2017 02:11:15 +0000 (11:11 +0900)]
Fix the format of wifi_carrier_content string
Carrier name is not displayed on the dialog due to the
incorrect format "%1%s". This should be "%1$s".
Test: String change, manually verified
Bug:
70814622
Change-Id: Ie30b8d1eb85d390e4023e0a251e1f1c7fa6deec0
TreeHugger Robot [Fri, 22 Dec 2017 03:31:30 +0000 (03:31 +0000)]
Merge "Relax char length limits and add clarifications"
TreeHugger Robot [Fri, 22 Dec 2017 02:18:30 +0000 (02:18 +0000)]
Merge changes from topic "battery_tip_constants"
* changes:
Add BatteryTipDetector and LowBatteryTip stuffs.
Add BatteryTipPolicy
Fan Zhang [Fri, 22 Dec 2017 01:33:06 +0000 (01:33 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" am:
7c46a79a00 -s ours am:
7e3fdede58
am:
c1ecf35052 -s ours
Change-Id: I670d004d2eb368b613f7cf2e7605a2c39e67293c
Fan Zhang [Fri, 22 Dec 2017 01:22:59 +0000 (01:22 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" am:
7c46a79a00 -s ours
am:
7e3fdede58
Change-Id: I650211969d19051a5ba69ff86c1c3f087fcaa453
Lifu Tang [Thu, 21 Dec 2017 03:54:49 +0000 (19:54 -0800)]
Relax char length limits and add clarifications
Bug:
70775976
Test: build, flash, and test manually
Change-Id: Ie278704bf32ce39fcd15509fdce09de2ace17993
Fan Zhang [Fri, 22 Dec 2017 01:13:32 +0000 (01:13 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
am:
7c46a79a00 -s ours
Change-Id: I83bb99c73fcd2818105b51633ea8c5c42bcd74a0
Treehugger Robot [Fri, 22 Dec 2017 01:01:41 +0000 (01:01 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
Fan Zhang [Fri, 15 Dec 2017 19:58:56 +0000 (11:58 -0800)]
DO NOT MERGE: Fix test failure in CodeInspectionTest
Change-Id: I74fbd30261fa66636c915936270d873e7612cbc6
Fixes:
70496869
Test: robotests
TreeHugger Robot [Thu, 21 Dec 2017 19:44:38 +0000 (19:44 +0000)]
Merge "Move ServiceListing to SettingsLib"
Jeff Sharkey [Thu, 21 Dec 2017 18:30:49 +0000 (18:30 +0000)]
Merge "Shift storage wizards over to Glif theme."
Tony Mantler [Wed, 20 Dec 2017 23:54:01 +0000 (15:54 -0800)]
Move ServiceListing to SettingsLib
Also tidy things up a bit
Bug:
70902607
Test: RunSettingsRoboTests
Change-Id: Id641beb601513bb4e34a098bf2729eb98954175d
TreeHugger Robot [Thu, 21 Dec 2017 13:37:36 +0000 (13:37 +0000)]
Merge "Managed profile lock timeout"
Maggie Wang [Thu, 21 Dec 2017 04:51:04 +0000 (04:51 +0000)]
Merge "Set initialExpandedChildrenCount dynamically in location settings"
Sudheer Shanka [Thu, 21 Dec 2017 03:51:40 +0000 (03:51 +0000)]
Merge "Update FakeUid to match BatteryStats.Uid."
Maggie [Wed, 20 Dec 2017 01:02:20 +0000 (17:02 -0800)]
Set initialExpandedChildrenCount dynamically in location settings
In location settings, we want "Advanced" button show up right after "App
level permissions". But with different numbers of "recent location requests" apps,
the Preferences hidden under Advanced could change.
To fix this issue, we fetch the list of apps with "recent location
requests" in LocationSettings.onCreate(), and set
initialExpandedChildrenCount for location PreferenceScreen to the apps
count.
Bug:
70350519
Test: Manual
Change-Id: I4c4b6bdfa916213494a29e8ae8b5f33476411c88
TreeHugger Robot [Thu, 21 Dec 2017 02:35:48 +0000 (02:35 +0000)]
Merge "Catch NullPointerException in PreIndexDataCollector."