Commit Graph

35943 Commits

Author SHA1 Message Date
Treehugger Robot
cd1f7a3146 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" 2017-06-16 18:41:42 +00:00
Bill Yi
251cbcbcc5 Import translations. DO NOT MERGE
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
2017-06-16 07:12:33 -07:00
Jian Zhou
2b7e3f228d Settings: Fix SparseArray null pointer issue in monkey issues
SparseArray null pointer causes monkey test exception, add a
protect for this.

Change-Id: Iade3148a846962875f5f38c5d2bf5631d0d9ac42

Bug: 62685823
2017-06-16 13:51:15 +08:00
Daniel Nishi
b088010d12 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
2017-06-15 17:25:10 -07:00
Tony Mak
80cdf176e9 Fix searching work app in settings NO PARTIAL RERUN
am: 5651e0f2ce

Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
2017-06-15 22:29:04 +00:00
Tony Mak
5651e0f2ce 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
2017-06-15 19:48:44 +00:00
Sundeep Ghuman
0c02e22c99 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am: 683a7e2bf5

Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
2017-06-15 06:39:40 +00:00
TreeHugger Robot
683a7e2bf5 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev 2017-06-15 06:30:58 +00:00
Sundeep Ghuman
60b814ba43 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
2017-06-14 19:07:05 -07:00
Bill Yi
e637b663e8 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 327b9119d7  -s ours

Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
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

Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
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

Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec
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

Change-Id: Id02583309a3e547855b7ffc69e065c2293fb172e
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

Change-Id: I7ec1ee37eb42d5523502ae3a17694f61ea6197ba
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

Change-Id: I649a4122952a41b31ee66b0daab8607b683d3e19
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

Change-Id: I78e6e1a16e25aff0e0374f5910fcbba0624f712b
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  -s ours

Change-Id: Iaec93787ba7a7e2eb885893842cea02932e16abe
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

Change-Id: Ic9c510dac141664020567877d501da6289b633b4
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

Change-Id: Ifd36cd50e2f4528dae247e99aafb5e93d916351e
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

Change-Id: Ie3fe1e8a7d2ac0c4045209403966dd80b7c4b5fa
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

Change-Id: I3e45e09f609428bd7abe46629d68adf54c5b357b
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

Change-Id: Iafb44eeb33fc626633ed885a2a18ed1cbe95ee48
2017-06-06 23:57:05 +00:00
William Luh
802f3e56d3 Merge "Make icons colorful for Security settings." into oc-dev
am: 9f7e705426

Change-Id: I397599ce60a3a334aae17ad77dfa94c4e7b24398
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

Change-Id: Iae57ad27902d3dcb5406007ddc21bb03545bfcea
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