Commit Graph

4269 Commits

Author SHA1 Message Date
Lei Yu
4b96ddb53d Merge "Remove the old battery page" into pi-dev am: 4e25277f60
am: 71333cb477

Change-Id: I166c6de0bd2a7150dbfbbe35783c2fab86c6ed45
2018-03-27 22:46:44 +00:00
TreeHugger Robot
4e25277f60 Merge "Remove the old battery page" into pi-dev 2018-03-27 20:23:23 +00:00
Daniel Nishi
ec4866b323 Merge "Don't allow a zero-length device name to work." 2018-03-27 19:52:41 +00:00
Amin Shaikh
b30587b473 Merge "Show wifi status label in preference summary." into pi-dev am: d467a8bc0f
am: 2f6979c9fe

Change-Id: I577ffa4b4e699a9163a5ca190fcfe08f167dc2f5
2018-03-27 13:49:09 +00:00
TreeHugger Robot
d467a8bc0f Merge "Show wifi status label in preference summary." into pi-dev 2018-03-27 13:10:24 +00:00
Victor Chang
dae61e0fa3 Fix crash in time zone picker due to race condition on view updates am: 201c629fcc
am: 93e464564f

Change-Id: I909d13c92601b63dccd782af2c0962e81507cc0f
2018-03-27 09:53:53 +00:00
Victor Chang
201c629fcc Fix crash in time zone picker due to race condition on view updates
- Can't reproduce the race condition with manual test, probably the view
  updates are fast enough that only monkey test can reproduce the issue.
- Reproduced a similar stacktrace and IndexOutOfBoundsException with
  Robolectric test by assuming that the race condition happens after
  text filtering and view updates. Try to fix the bug with this assumption
- The fix is to bind the data (data position in adapter) with ViewHolder.

Bug: 75322108
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ie5d932bce30590b8067e042c3380911c9608872f
2018-03-27 09:31:54 +00:00
Wenhung Teng
17c93edb3c Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev am: 032b0454f8
am: 00bddd986e

Change-Id: Ie15b207e3d75ee862e58be72dc240da9f9d859df
2018-03-27 06:33:29 +00:00
Wenhung Teng
032b0454f8 Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev 2018-03-27 06:13:53 +00:00
Adam Newman
61484db01d Merge "Observe NetworkCallback instead of polling" into pi-dev am: d2fb46eac4
am: 211535a10d

Change-Id: I440c17b8cf5670e40706f07832737927930de986
2018-03-27 06:01:17 +00:00
Adam Newman
d2fb46eac4 Merge "Observe NetworkCallback instead of polling" into pi-dev 2018-03-27 05:23:21 +00:00
Fan Zhang
ec67075abc Merge "Use custom drawable for Battery saver condition icon." into pi-dev am: 74ac3b1f3a
am: b4c4d47e2e

Change-Id: Ib7d4ea27dae28192ce4e1a53324b9062a2e6948b
2018-03-27 05:20:19 +00:00
Fan Zhang
74ac3b1f3a Merge "Use custom drawable for Battery saver condition icon." into pi-dev 2018-03-27 04:25:15 +00:00
Fan Zhang
0c8f8a8b46 Use custom drawable for Battery saver condition icon.
- Updated condition interface to use Drawable instead of Icon for icons.
- Converted all conditions to return drawable instead of Icon.
- Created a BatterySaverDrawable to draw a static battery saver icon.

Change-Id: Ie964f3439009c7658603a8ff352a05e964a0a795
Fixes: 76168403
Test: robotests
2018-03-26 17:50:27 -07:00
Lei Yu
68ffee1a7d Remove the old battery page
This CL removes PowerUsageSummaryLegacy and PowerUsageAdvancedLegacy
and their related layouts and strigns.

Also remove the isBatteryV2Enabled method in feature provider.

Change-Id: I1ec30f713d733ed24335a3e698fb515751232948
Fixes: 76027338
Test: robo test still pass
2018-03-26 17:40:10 -07:00
Fan Zhang
607d63468a Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev am: 9f5849aaf4
am: a89fb2e6dd

Change-Id: I58c96bdace9c5a5cd2ff8d8e61c53e4f5f962495
2018-03-26 22:17:03 +00:00
Lei Yu
5dea982625 Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev am: 6f22cec26d
am: 13a40e76eb

Change-Id: Id996b022ac0c98226698469d5afc4b6aab4ba9cb
2018-03-26 22:03:30 +00:00
TreeHugger Robot
9f5849aaf4 Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev 2018-03-26 21:50:14 +00:00
Lei Yu
6f22cec26d Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev 2018-03-26 21:41:11 +00:00
yuemingw
03b617bdea Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev am: 21926abed2
am: a3db549834

Change-Id: If7c967d8bf7eddf3a50bd3d629e3e79c85fac5e6
2018-03-26 18:51:49 +00:00
Amin Shaikh
c685d0fe9b Show wifi status label in preference summary.
Bug: 74075761
Test: m RunSettingsRoboTests && manual
Change-Id: I286fac5d9390634facc0f04b845ef668c55d1331
2018-03-26 14:37:09 -04:00
TreeHugger Robot
21926abed2 Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev 2018-03-26 18:34:31 +00:00
Fan Zhang
de052eb2b9 Fix text overlap issue when flinging in ManageApplication
The issue is we have a background handler to find app size and set to
summary asynchronously. When flinging quickly, the view being request to
update by the background handler could be scrolled off screen already.
This change forces onPackageSizeChanged update to only happen when it's
not scrolling.

Change-Id: Ia7ccab776c3c789c8d4c0b55104b48e257b9cebf
Fixes: 76176014
Test: manually fling
2018-03-26 11:34:16 -07:00
Lei Yu
1785863b48 Use FIELD_ANOMALY_TYPE for anomalyType
Change-Id: I36d5d806f45df4153cdba3e398fa72ab89e5e082
Fixes: 76424026
Test: RunSettingsRoboTests
2018-03-26 11:31:22 -07:00
Julia Reynolds
1de83b7c65 Update recently sent preferences am: 5c83f14d7e
am: 6a942f930b

Change-Id: I4088f66e3c798a30043ccb6e48685f3fa5f7700d
2018-03-26 17:50:47 +00:00
yuemingw
5f0f6b9831 Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS
is set.

createAdminIntentSupport always checks user restrictions on user 0(
if called from system uid) so can't be used here when account could
be work profile account.

Bug: 70674230
Test: m -j RunSettingsRobotests
Change-Id: Ibd2df8891d9fa7b4c85c42a305c5db2acd4c829b
2018-03-26 17:41:37 +01:00
Julia Reynolds
5c83f14d7e Update recently sent preferences
Test: make -j RunSettingsRoboTests
Bug: 74318867
Fixes: 73004227
Change-Id: Icecf1d4f0e3dd38c96919874a7f614ed93a001ab
2018-03-26 11:23:14 -04:00
Adam Newman
5178a9d07a Observe NetworkCallback instead of polling
Switch from polling for the first connected WiFi network to observing
the currently connected WiFi network and associating that with the
preference at the time the preference is created or updated.

Whenever the ConnectedAccessPointPreference is removed or UI is stopped
unregister the callback.

Bug:68031656
Test: make RunSettingsRoboTests
Change-Id: I5d1ed83b6a13e8a83fae04bfdce8d0f13c2ba0ac
2018-03-26 07:45:16 -07:00
Benjamin Franz
5b0bc69b38 Merge "Do not allow force stopping protected packages" into pi-dev am: 396e91abf0
am: c81072f6ab

Change-Id: I03da3f59434e58936afb6646d393393a8899965e
2018-03-26 09:42:31 +00:00
Benjamin Franz
396e91abf0 Merge "Do not allow force stopping protected packages" into pi-dev 2018-03-26 09:15:41 +00:00
WenHung_Teng
8e14da1d30 Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev
Clear uid to package detail cache by checking locale before use.

Fixes: 62422871
Test: RunSettingsRoboTest pass,
manual test
(1) open advance battery settings page,
(2) switch locale,
(3) back to advance battery settings page  => pass
manual test
(1) open advance battery settings page, and then back to settings main page
(2) switch locale,
(3) go to advance battery settings page  => pass

Change-Id: Ifac830706539022cd9bf51d3f33e728aadc163f4
2018-03-26 14:46:44 +08:00
Matthew Fritze
206691d079 Merge "Return back-up slices for unavailable settings" into pi-dev am: 362ba01789
am: 2cc4516030

Change-Id: Iaf5c385ebae91340294b027ee6037bb0589fa607
2018-03-24 07:59:35 +00:00
Maurice Lam
2f4745d402 Merge "Separate skip and clear button in pattern screen" into pi-dev am: 59b25d0043
am: f95ec59cbf

Change-Id: Ia8aeb392ce080533c503d3cf4e9b6e9370425e87
2018-03-24 07:58:42 +00:00
Lei Yu
3f49c24d3f Merge "Add callback when tethering fails" into pi-dev am: 1682085feb
am: 7fcde4490c

Change-Id: Ie1e512ffa61b138769b25bf0c54bc459940f91fc
2018-03-24 07:56:32 +00:00
Fan Zhang
d157f7c846 Merge "Add preference controller to launch app-time-spent UI." into pi-dev am: 30da391fa0
am: 490eaa1c8c

Change-Id: Ic19a6b808359f45a8c51d06de04d635d1ea10ceb
2018-03-24 07:54:54 +00:00
TreeHugger Robot
362ba01789 Merge "Return back-up slices for unavailable settings" into pi-dev 2018-03-24 07:04:47 +00:00
TreeHugger Robot
59b25d0043 Merge "Separate skip and clear button in pattern screen" into pi-dev 2018-03-24 05:46:35 +00:00
TreeHugger Robot
1682085feb Merge "Add callback when tethering fails" into pi-dev 2018-03-24 05:24:09 +00:00
TreeHugger Robot
30da391fa0 Merge "Add preference controller to launch app-time-spent UI." into pi-dev 2018-03-24 05:14:32 +00:00
Fan Zhang
64a8f70a7f Add preference controller to launch app-time-spent UI.
Bug: 74580195
Test: robotests
Change-Id: Iba9338f04cc037a134ef9445ce97cbbe21f53833
2018-03-23 14:13:57 -07:00
Lei Yu
18994382d5 Merge "Hide password for wifi tether" into pi-dev am: 9bb2efa0ff
am: 1684f605f7

Change-Id: I8351f06cfdf8e505e1c00c78bfc3daaca15703b4
2018-03-23 20:10:15 +00:00
Sean Callanan
504cc266d8 [Settings] Add strings for Natural and Automatic color modes
These strings are not properly reflected in the UI yet.  Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).

Bug: 75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
(cherry picked from commit e8f9bf5f68)
2018-03-23 20:06:25 +00:00
Fan Zhang
2e1d9e802a Merge changes I034a9f0a,Iad5ec577 into pi-dev am: dd5977901d
am: 7e75de29b1

Change-Id: Ife81eb4fa926cd9a54e84ea4b9d5374c07e1a5b6
2018-03-23 20:03:54 +00:00
Matthew Fritze
fcdfc2d83f Return back-up slices for unavailable settings
When an inline slice is requested, and the setting is unavailable,
we should present more useful information to the user. This CL handles:
- Unsupported: return intent slice to Settings home page
- Disabled for user: intent to the setting page
- Unknown reason: intent to setting page
- Disabled dependency: Create intent-based Slice rather
than the requested inline slice.

Bug: 71640747
Test: robotests
Change-Id: I9c1a0ee36119d4f9f3b205e0824c251f4356db55
2018-03-23 12:47:36 -07:00
TreeHugger Robot
9bb2efa0ff Merge "Hide password for wifi tether" into pi-dev 2018-03-23 17:37:23 +00:00
TreeHugger Robot
dd5977901d Merge changes I034a9f0a,Iad5ec577 into pi-dev
* changes:
  Get rid of UserPackageWrapper util.
  Get rid of extra whitespace under divider lines
2018-03-23 17:36:54 +00:00
Jason Monk
fb9b6077c4 Merge "Add option for settings to push to a device index" into pi-dev am: f9c6bc59ae
am: 5411c21dde

Change-Id: I48ecc5d6e892a8662d5f0ad019579d6d2396c18a
2018-03-23 17:08:10 +00:00
Jason Monk
f9c6bc59ae Merge "Add option for settings to push to a device index" into pi-dev 2018-03-23 16:52:24 +00:00
Antoan Angelov
7e866d903e Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev am: 84a4dd0bde
am: 3f0b96cd18

Change-Id: I817a4aef7e1fbad8a6bccc9a455b32dabc13d96c
2018-03-23 14:26:03 +00:00
Antoan Angelov
84a4dd0bde Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev 2018-03-23 14:10:29 +00:00