Bill Yi
e637b663e8
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 327b9119d7
2017-06-13 08:11:23 +00:00
TreeHugger Robot
327b9119d7
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-13 08:07:08 +00:00
Alison Cichowlas
0320d4e69f
Limit unconfigurability to specified channels.
...
am: 80fa6b5833
2017-06-13 01:41:39 +00:00
Bill Yi
118be8a9d7
Import translations. DO NOT MERGE
...
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
2017-06-12 18:23:15 -07:00
Alison Cichowlas
80fa6b5833
Limit unconfigurability to specified channels.
...
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 23:17:11 +00:00
Antony Sargent
92661526d4
Merge "Set advanced battery usage items as non-selectable" into oc-dev
...
am: d77b699e60
2017-06-09 15:49:11 +00:00
Antony Sargent
d77b699e60
Merge "Set advanced battery usage items as non-selectable" into oc-dev
2017-06-09 15:41:27 +00:00
jackqdyulei
3aae1f336e
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
...
am: 4f02eebab8
2017-06-09 08:34:46 +00:00
TreeHugger Robot
4f02eebab8
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
2017-06-09 08:29:57 +00:00
jackqdyulei
82fcadad65
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
2017-06-08 21:49:15 -07:00
jackqdyulei
424edd3064
Merge "Update subtitle for apps in battery settings" into oc-dev
...
am: 031b90541f
2017-06-09 02:57:46 +00:00
TreeHugger Robot
031b90541f
Merge "Update subtitle for apps in battery settings" into oc-dev
2017-06-09 02:53:36 +00:00
Matthew Fritze
d07e14fb5b
Merge "Search results always highlight proper results" into oc-dev
...
am: 2a32cb6a33
2017-06-09 01:23:39 +00:00
TreeHugger Robot
2a32cb6a33
Merge "Search results always highlight proper results" into oc-dev
2017-06-09 01:19:38 +00:00
Daniel Nishi
60287a50e8
Merge "Update the music files icon." into oc-dev
...
am: 47c6afde7f
2017-06-09 00:19:03 +00:00
TreeHugger Robot
47c6afde7f
Merge "Update the music files icon." into oc-dev
2017-06-09 00:13:19 +00:00
Matthew Fritze
33f3e3f4f7
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
2017-06-08 16:25:52 -07:00
Bill Yi
52c0cd702c
Import translations. DO NOT MERGE
...
am: 29a7bce4e5
2017-06-08 22:48:47 +00:00
jackqdyulei
dcea4e894e
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
2017-06-08 12:52:48 -07:00
Daniel Nishi
e1571b8dac
Update the music files icon.
...
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes: 62291640
Test: Manual
2017-06-08 10:24:14 -07:00
Bill Yi
29a7bce4e5
Import translations. DO NOT MERGE
...
Change-Id: I118bf54c3426f15db267545b83e9478177d13a06
Auto-generated-cl: translation import
2017-06-08 07:59:38 -07:00
Bartosz Fabianowski
74f5dc85b9
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
...
am: 9e94d80fa5
2017-06-08 05:55:40 +00:00
TreeHugger Robot
9e94d80fa5
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
2017-06-08 05:51:15 +00:00
jackqdyulei
33cb1408e2
Merge "Use default package in BatteryEntry" into oc-dev
...
am: f5f51c4cf2
2017-06-08 02:13:24 +00:00
TreeHugger Robot
f5f51c4cf2
Merge "Use default package in BatteryEntry" into oc-dev
2017-06-08 02:10:30 +00:00
Shinji Sogo
ba1b520505
Cleanup unused WifiP2pSettings code in WifiSettings
...
Cleanup commented code giving access to WifiP2pSettings from option menu
is not needed anymore.
Bug: 38333540
Test: Manual test
Change-Id: I5884ec219ba09601d9602f026fa8ad89f765934f
2017-06-07 22:55:24 +00:00
Matthew Fritze
08bdbf3d5a
Merge "Hide Display Theme from search results when not available" into oc-dev
...
am: 9f2f9e331f
2017-06-07 20:46:56 +00:00
TreeHugger Robot
9f2f9e331f
Merge "Hide Display Theme from search results when not available" into oc-dev
2017-06-07 20:39:38 +00:00
jackqdyulei
a64839b59d
Use default package in BatteryEntry
...
Before this cl, we use the first package name if there is a name
list in BatterySipper.
We should use BatteryEntry.defaultPackageName instead, which could
describle the batterysipper more accurately.
Bug: 62417935
Test: RunSettingsRoboTests
Change-Id: I44fa151c0cf8f14cba305f179c7e94e5bc3ce434
2017-06-07 13:20:47 -07:00
Matthew Fritze
ac5956a5cf
Hide Display Theme from search results when not available
...
Test: make RunSettingsRoboTests
Fixes: 62377986
Change-Id: I5d0737034ef3f845e790934465b65a5415654822
2017-06-07 16:21:44 +00:00
Bartosz Fabianowski
1e44c0e4b5
Add keys to all Preferences on the Managed device info page
...
In order to be able to hide the page from search results, all Preferences
(and PreferenceCategories) must have android:keys.
Bug: 62285529
Test: The Settings framework will have a test that ensure each Preference
Test: has a key from O-DR onward
Change-Id: I1e41ce6f8b9f90155ef92354b9268e9e720e1e73
2017-06-07 08:49:14 +02:00
Antony Sargent
e28dfea13b
Set advanced battery usage items as non-selectable
...
The items in the ListView for the Advanced battery usage screen should
not ripple when touched, since these items don't do anything.
Bug: 38019330
Test: make RunSettingsRoboTests
Change-Id: I987a770f0f146b02bbf947238be7490e8a170feb
2017-06-06 17:12:17 -07:00
William Luh
5a4603f5b3
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
...
am: f702e39156
2017-06-06 23:57:31 +00:00
Alison Cichowlas
59b4e5b6c4
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
...
am: 9fa5e66a66
2017-06-06 23:57:05 +00:00
William Luh
802f3e56d3
Merge "Make icons colorful for Security settings." into oc-dev
...
am: 9f7e705426
2017-06-06 23:56:36 +00:00
TreeHugger Robot
f702e39156
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
2017-06-06 23:52:49 +00:00
TreeHugger Robot
9fa5e66a66
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
2017-06-06 23:34:44 +00:00
TreeHugger Robot
9f7e705426
Merge "Make icons colorful for Security settings." into oc-dev
2017-06-06 23:31:08 +00:00
Lorenzo Colitti
1185ea72f2
Merge "Wifi details: minor ordering fixes." into oc-dev
...
am: 85395155fb
2017-06-06 22:35:42 +00:00
Lorenzo Colitti
85395155fb
Merge "Wifi details: minor ordering fixes." into oc-dev
2017-06-06 22:24:43 +00:00
William Luh
ac7aa59989
Make icons colorful for Security settings.
...
Bug:37997112
Test: make RunSettingsRoboTests
Change-Id: I287b5321cab0d4432fae61cf5565251180f37f5f
2017-06-06 14:05:10 -07:00
Alison Cichowlas
130a028f33
If two groups are posted to settings, remove old group and log.
...
Bug: 62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
2017-06-06 17:02:23 -04:00
Hiroki Yamamoto
a1f5332068
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041 am: 56a8267f59
...
am: 77452b8a57
2017-06-06 19:34:49 +00:00
Hiroki Yamamoto
77452b8a57
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041
...
am: 56a8267f59
2017-06-06 19:28:41 +00:00
Hiroki Yamamoto
56a8267f59
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
...
am: e990bf3041
2017-06-06 19:22:09 +00:00
Treehugger Robot
e990bf3041
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
2017-06-06 19:12:55 +00:00
Andrew Sapperstein
b5fb71acc6
Merge "Revert "Initial search bar implementation."" into oc-dev
...
am: dfc1983601
2017-06-06 19:10:43 +00:00
TreeHugger Robot
dfc1983601
Merge "Revert "Initial search bar implementation."" into oc-dev
2017-06-06 19:04:26 +00:00
Matthew Fritze
74eda7150b
Merge "Check for dynamic summaries at display time for search" into oc-dev
...
am: 2046c59b77
2017-06-06 19:00:29 +00:00
Andrew Sapperstein
93adcee630
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
...
am: 37f87b6c64
2017-06-06 19:00:04 +00:00
