Commit Graph

47034 Commits

Author SHA1 Message Date
Lei Yu
5a9ff423f2 Merge changes I77a53f70,I853d3611
* changes:
  Add functions for table action.
  Create table to store user action.
2018-07-27 01:34:25 +00:00
TreeHugger Robot
143bd993ab Merge "Update AppCheckBoxPreference to show summary" 2018-07-27 00:37:43 +00:00
TreeHugger Robot
f9341c4c0b Merge "When wallpaper colors not ready set sys ui flags when ready" 2018-07-26 23:21:36 +00:00
jackqdyulei
6b09f54e06 Add functions for table action.
1. Insert/Update/Query/Delete
2. Update the action when app been restricted
3. Display restriction time in RestrictedAppDetails

Bug: 111366678
Test: RunSettingsRoboTests
Change-Id: I77a53f70e1ce4b612aabe28b7a1bb5df8f3ec9d5
2018-07-26 16:19:25 -07:00
Matthew Ng
932b20272a When wallpaper colors not ready set sys ui flags when ready
Uses a listener on wallpaper manager to get the wallpaper colors for
fallback home. When the colors are ready it can correctly set the system
ui flags.

Change-Id: I7119c0f035245539cb69bec1ccccecef64d3aff5
Fixes: 79776583
Test: reboot phone, unlock with pin/pattern with light them wallpaper
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FallbackHomeActivityTest
2018-07-26 15:22:41 -07:00
jackqdyulei
db0b4f49c9 Update AppCheckBoxPreference to show summary
The summary is invisible by default if we use preference_app.xml,
this CL turn it on if summary is not empty.

Bug: 111366678
Test: RunSettingsRoboTests
Change-Id: I3fe5827a5e80a8e21309b163dbbaa1070f5ee61e
2018-07-26 15:06:45 -07:00
TreeHugger Robot
44a8768fb1 Merge "Pass in context when loading icons from Tile" 2018-07-26 21:58:49 +00:00
jackqdyulei
ea8f2187d5 Create table to store user action.
For example, it will store when user restrict an app.

Bug: 111366678
Test: Build
Change-Id: I853d3611f260436d1f97ee7b0a40c52a8bde0678
2018-07-26 13:56:12 -07:00
TreeHugger Robot
02e4a027c9 Merge "PowerUsageSummary: move controllers to xml" 2018-07-26 20:13:44 +00:00
Fan Zhang
1c61a58f0d Pass in context when loading icons from Tile
Bug: 111860183
Test: robotests
Change-Id: I836ad66eb420f4e0bd0bbded541f4dfe947c9b18
2018-07-26 13:09:25 -07:00
jackqdyulei
076b674764 PowerUsageSummary: move controllers to xml
Also change the following controllers to have standard constructor
1. BatteryHeaderPreferenceController
2. BatteryTipPreferenceController

Change-Id: I2e68082295eb8ef18de9fef9483a10b070c77a47
Fixes: 111131567
Test: robotest
2018-07-26 11:40:28 -07:00
Prabir Pradhan
ee8bf5d463 Merge "Add a boolean flag to show or hide the device name in About device." 2018-07-26 05:24:49 +00:00
TreeHugger Robot
c793e454ec Merge "Fix the empty preference after clicking gear icon" 2018-07-26 03:34:36 +00:00
felkachang
c2b6764057 Fix the empty preference after clicking gear icon
Because there is no other options for 'None' or 'Swipe, there is no
necessary for showing the gear icon to show options.

'Lock screen message' could be found in
Settings > Display > Lock screen display.

Add testcase to verify the ChangeScreenLockPreferenceController's
behavior.

Test: make ROBOTEST_FILTER=ChangeScreenLockPreferenceControllerTest \
      RunSettingsRoboTests -j40
Change-Id: Icdcd672261749d106162053d6f5228cee420a810
Fixes: 110848852
2018-07-26 10:16:12 +08:00
TreeHugger Robot
9d3773880d Merge "Restore the up time preference." 2018-07-26 00:50:31 +00:00
Prabir Pradhan
7758fcc6dd Add a boolean flag to show or hide the device name in About device.
The following boolean flag is added:
config_show_device_name

When set to false, the device name will not be shown in System > About
Device.

Bug: 111653180
Test: Updated robotests
Change-Id: Id9610e2009604c9d9693428adff01adc7d606565
2018-07-25 17:06:21 -07:00
TreeHugger Robot
21c8cde8a3 Merge "Clean up unused deps" 2018-07-25 23:48:14 +00:00
Doris Ling
d526c973f6 Restore the up time preference.
- up time preference is removed when we updated to the new version of
about phone settings. Add it back to the preference xml, and restore the
controller for it.

Change-Id: I245316e84d04f9d6f033377c944b615dd6e138a5
Fixes: 111828610
Test: manual
2018-07-25 16:43:40 -07:00
TreeHugger Robot
6c5d13aadb Merge "Use Tile.getIcon() to avoid caching issue" 2018-07-25 23:25:54 +00:00
TreeHugger Robot
ba6fd357a9 Merge "Check for WiFi controller for summary population." 2018-07-25 22:51:00 +00:00
Fan Zhang
4329792198 Clean up unused deps
Test: rebuild
Change-Id: I7caa30024046ae832cafef6598ecf74db4aba8bf
2018-07-25 15:25:05 -07:00
Ben Lin
96dc235f6e Check for WiFi controller for summary population.
WiFiController might return not available, so we should only surface
"Wi-Fi" as a summary entry if it's available in the settings page.

This also checks for empty strings in case they are declared as such in
the XML (since XML can be device/product overlay'd), to avoid situations
such as ", data usage".

Bug: 111398942
Test: Manual check, and I see Wi-Fi no longer visible for cases where
Wifi controller isn't available.
Test: make RunSettingsRoboTests
Change-Id: I24736a6240c50e2ea38ce424fbac2316721290d8
2018-07-25 14:14:11 -07:00
Fan Zhang
701b65eccc Use Tile.getIcon() to avoid caching issue
Bug: 77600770
Test: robotests
Change-Id: Icb21f5da9b542abc239b04b71813290ad3104ffb
2018-07-25 12:06:10 -07:00
TreeHugger Robot
f24b749ec0 Merge "Remove unused interface API" 2018-07-25 18:28:46 +00:00
TreeHugger Robot
f94d01d542 Merge "Change floating search button icon" 2018-07-25 17:41:11 +00:00
Mill Chen
c00cce4829 Change floating search button icon
- Add an alias name for floating search button

Bug: 111665984
Test: rebuild
Change-Id: I020cd4a163ae586f5b8faa0d4f8d9bc8bbd84fa4
2018-07-25 17:38:48 +08:00
Fan Zhang
75dc0c4d32 Remove unused interface API
Bug: 111796429
Test: robotests
Change-Id: I5887a0a48285cf61777ac7c6a896d16dd7585a26
2018-07-24 15:00:35 -07:00
Doris Ling
c879386e5a Merge "Fix new account not shown for work profile." 2018-07-24 17:57:43 +00:00
Kevin Chyn
3d3219eb02 Merge "Update Security & location preference summary depending on biometrics" 2018-07-24 17:42:36 +00:00
TreeHugger Robot
da5b246e8d Merge "Modified the char limit" 2018-07-24 16:20:25 +00:00
Dario Freni
d5247039c2 [automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours am: 1e56e69a46 -s ours am: 1237373743 -s ours
am: 64e4c89ef6  -s ours

Change-Id: I8b4a41fa2ef2fb023ba4f5ac96494be8172cb6ec
2018-07-24 04:11:18 -07:00
Dario Freni
64e4c89ef6 [automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours am: 1e56e69a46 -s ours
am: 1237373743  -s ours

Change-Id: I00878455de5f09b6ab95d03ae5def411c8c0cb9e
2018-07-24 04:06:25 -07:00
Dario Freni
1237373743 [automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours
am: 1e56e69a46  -s ours

Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
2018-07-24 04:02:45 -07:00
Dario Freni
1e56e69a46 [automerger skipped] Merge "Include NOTICE file in /product partition."
am: aa2ec5f239  -s ours

Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
2018-07-24 03:58:08 -07:00
Treehugger Robot
aa2ec5f239 Merge "Include NOTICE file in /product partition." 2018-07-24 10:35:44 +00:00
TreeHugger Robot
add367f0d0 Merge "Delegate PrintServicesLoader to the framework's one" 2018-07-24 10:17:53 +00:00
Kevin Chyn
eb0de79ffc Update Security & location preference summary depending on biometrics
Fixes: 110960063

Test: manual
Test: make -j56 SettingsRoboTests ROBOTEST_FILTER=SecuritySettingsTest
Change-Id: Ia9186af37c84f4ff0391d1b72043948934ed997b
2018-07-23 21:21:53 -07:00
Sunny Shao
ea846c6482 Modified the char limit
- Modified the comment in strings.xml and extended the length of the CHAR LIMIT

Change-Id: I39d065aad7473bb1111db690c7b7a1ff81de459c
Fixes: 111697704
Test: visual
2018-07-24 11:56:49 +08:00
Doris Ling
ce5f9c07da Fix new account not shown for work profile.
When refreshing the Accounts settings UI, we uses the cached user info
for checking user status. However, when the work profile is being
updated, the UserInfo obejct for the user might be updated even the
user id is the same. Using the cached data causes stale info to be
returned for the user and results in the latest account data not
being shown properly for the user. Update the cache to the latest user
info retrieved from user manager.

Change-Id: Ic0127842203f0288f2fdea6c6346cd11e42a8bf0
Fix: 38302246
Test: make RunSettingsRoboTests
2018-07-23 16:13:39 -07:00
Fan Zhang
75bafefa49 Move CategoryManager to Settings.
Bug: 77600770
Test: robo
Change-Id: Id4a0c89938d43d21147944b820a191486c589238
2018-07-23 15:09:41 -07:00
Irina Dumitrescu
4fb1e1a633 Update notification_settings_work_profile comment.
Test: n/a
Fixes: 111699435
Change-Id: I1a33204f5305db28e7d423b4b2523ed64c675e46
2018-07-23 13:58:20 +00:00
Kevin Chyn
c01cb892b1 Merge "Fix settings crash after androidx refactoring" 2018-07-21 01:24:58 +00:00
Kevin Chyn
074fe1e473 Fix settings crash after androidx refactoring
Fixes: 111701576

Change-Id: I095d4837e7a34fb9f240f2a302b5c6f7d1142db9
Fixes: 111701576
2018-07-20 17:19:52 -07:00
Ian Pedowitz
836b777fa5 Remove the character limit
This could cause existing messages to get clipped

Effectively reverting part of e7c3ca0e2e

Bug: 111577594
Test: None, is a revert of this config
Change-Id: Ifaa8c9674db3c6865b3b59fcd254bb3e2b20a5f5
2018-07-20 16:40:39 -07:00
TreeHugger Robot
448c61ffb9 Merge "Request lock screen message focus and limit character limit" 2018-07-20 23:32:35 +00:00
TreeHugger Robot
167b232242 Merge "Hide lock screen display in search if it's not in Settings" 2018-07-20 23:10:28 +00:00
Fan Zhang
e7c3ca0e2e Request lock screen message focus and limit character limit
Change-Id: I78594d03ae5430f63e46cb97e2413c1c4bf60d8a
Fixes: 111577594
Test: manual
2018-07-20 15:34:13 -07:00
Doris Ling
c24865e242 Merge "Fix battery animation not being played." 2018-07-20 22:28:53 +00:00
Fan Zhang
c00b042678 Merge changes from topic "migrate-alerdialog-androidx"
* changes:
  Migrate all AlertDialogs to AndroidX version
  Migrate all AlertDialogs to AndroidX version
2018-07-20 21:52:06 +00:00
Fan Zhang
44acde5ee1 Hide lock screen display in search if it's not in Settings
Change-Id: Iacf16eb947a679e08a6c55e0764416cd53cac2e7
Fixes: 111641373
Test: robotests
2018-07-20 14:50:02 -07:00