OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoMerge changes I690fa4c2,I53632e4e
Fan Zhang [Wed, 6 Feb 2019 23:51:57 +0000 (23:51 +0000)]
Merge changes I690fa4c2,I53632e4e

* changes:
  Use system defined card corners instead of hardcoding to 8.
  Add PRIVACY_SETTINGS intent to privacy, not backup, page.

5 years agoUse system defined card corners instead of hardcoding to 8.
Fan Zhang [Wed, 6 Feb 2019 18:43:54 +0000 (10:43 -0800)]
Use system defined card corners instead of hardcoding to 8.

Change-Id: I690fa4c2d5a52d1cb6e1606b5c961d0116a5707b
Fixes: 123985440
Test: visual

5 years agoAdd PRIVACY_SETTINGS intent to privacy, not backup, page.
Fan Zhang [Wed, 6 Feb 2019 18:37:03 +0000 (10:37 -0800)]
Add PRIVACY_SETTINGS intent to privacy, not backup, page.

Bug: 123878762
Test: updated backupSettingsHelper
Change-Id: I53632e4eeb5fa42447aa5fc075be69eeb68cdd52

5 years agoMerge "Add master audio balance setting"
Andy Hung [Wed, 6 Feb 2019 18:51:35 +0000 (18:51 +0000)]
Merge "Add master audio balance setting"

5 years agoMerge "Add an on/off switch to the top of mobile network details page"
TreeHugger Robot [Wed, 6 Feb 2019 18:00:25 +0000 (18:00 +0000)]
Merge "Add an on/off switch to the top of mobile network details page"

5 years agoMerge "Add settings for notification bubbling"
Julia Reynolds [Wed, 6 Feb 2019 13:41:43 +0000 (13:41 +0000)]
Merge "Add settings for notification bubbling"

5 years agoUpdate header test to 'Work profile input & assistance'
Yohei Yukawa [Wed, 6 Feb 2019 03:54:59 +0000 (19:54 -0800)]
Update header test to 'Work profile input & assistance'

Per suggestion from UX, this CL updates the category header of
work-profile specific enties in Languages & input from
  Work profile
to
  Work profile input & assistance.

Other than that, there is no user-visible behavior change.

Bug: 123314089
Test: Manually verified as follows.
  1. Build and flash an AOSP build
  2. Install Test DPC
  3. Open Settings -> System -> Languages & input
  4. Make sure that the new category header for work-profile specific
     entries is now shown as "Work profile input & assistance"
Change-Id: I4a4fb7c8a31d8d849780e71796b92ec0a2f026e3

5 years agoMerge "Move android.settings.PRIVACY_SETTINGS to PrivacySettings."
TreeHugger Robot [Wed, 6 Feb 2019 03:20:35 +0000 (03:20 +0000)]
Merge "Move android.settings.PRIVACY_SETTINGS to PrivacySettings."

5 years agoMerge "Add developer option for device identifier restrictions"
Michael Groover [Wed, 6 Feb 2019 00:00:08 +0000 (00:00 +0000)]
Merge "Add developer option for device identifier restrictions"

5 years agoMove android.settings.PRIVACY_SETTINGS to PrivacySettings.
Fan Zhang [Tue, 5 Feb 2019 23:23:39 +0000 (15:23 -0800)]
Move android.settings.PRIVACY_SETTINGS to PrivacySettings.

Bug: 123878762
Test: manual
Change-Id: I9312c8455b0325f7c582523938a1fde21fbd81ce

5 years agoMerge "Use adaptive icon shapes for settings homeepage"
TreeHugger Robot [Tue, 5 Feb 2019 23:13:08 +0000 (23:13 +0000)]
Merge "Use adaptive icon shapes for settings homeepage"

5 years agoMerge "Close slice cursor when done using."
TreeHugger Robot [Tue, 5 Feb 2019 22:57:45 +0000 (22:57 +0000)]
Merge "Close slice cursor when done using."

5 years agoAdd master audio balance setting
Edward Savage-Jones [Tue, 24 Jan 2017 23:44:18 +0000 (00:44 +0100)]
Add master audio balance setting

This adds an audio balance slider to accessibility allowing the end
user to adjust the audio balance between left and right channels.

Test: Change Balance through Settings, play audio
Bug: 28390736
Change-Id: I70f22d222ea310fd33ebe4f3fb054f44f69d2548

5 years agoMerge "Use correct uid when querying usage data for specific user."
TreeHugger Robot [Tue, 5 Feb 2019 22:11:04 +0000 (22:11 +0000)]
Merge "Use correct uid when querying usage data for specific user."

5 years agoMerge "Update the Hearing Aids Strings" am: 3afa2a7acb am: f8ba53c6fb
Stanley Tng [Tue, 5 Feb 2019 21:32:47 +0000 (13:32 -0800)]
Merge "Update the Hearing Aids Strings" am: 3afa2a7acb am: f8ba53c6fb
am: fdd54f74ed

Change-Id: I3b33647aac8fa8fe1757825a3f9d43fccc9efa35

5 years agoMerge "Update the Hearing Aids Strings" am: 3afa2a7acb
Stanley Tng [Tue, 5 Feb 2019 21:16:09 +0000 (13:16 -0800)]
Merge "Update the Hearing Aids Strings" am: 3afa2a7acb
am: f8ba53c6fb

Change-Id: I5d6a76265ccb0a7263bb689fa8a3ef4a0044e77a

5 years agoMerge "Update the Hearing Aids Strings"
Stanley Tng [Tue, 5 Feb 2019 21:05:41 +0000 (13:05 -0800)]
Merge "Update the Hearing Aids Strings"
am: 3afa2a7acb

Change-Id: I5310642f04558d961aa82df933791b08d883d92e

5 years agoClose slice cursor when done using.
Fan Zhang [Tue, 5 Feb 2019 20:43:51 +0000 (12:43 -0800)]
Close slice cursor when done using.

Change-Id: I22f2d5fe990fb43e1694879f27d7c0be26675d2b
Fixes: 123878106
Test: manual

5 years agoAdd an on/off switch to the top of mobile network details page
Antony Sargent [Fri, 1 Feb 2019 00:21:26 +0000 (16:21 -0800)]
Add an on/off switch to the top of mobile network details page

When a device is in DSDS mode and has two mobile network subscriptions,
a user may want to completely disable one of those subscriptions. This
implements the UI for this, calling into some recently added APIs in the
SubscriptionManager class.

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: I40fd3e777ce3542004e4761406b24196505b97d8

5 years agoMerge "Move trust agent toggles to developer options"
Vishwath Mohan [Tue, 5 Feb 2019 20:28:31 +0000 (20:28 +0000)]
Merge "Move trust agent toggles to developer options"

5 years agoMerge "Update the Hearing Aids Strings"
Treehugger Robot [Tue, 5 Feb 2019 20:20:51 +0000 (20:20 +0000)]
Merge "Update the Hearing Aids Strings"

5 years agoUse adaptive icon shapes for settings homeepage
Amin Shaikh [Tue, 5 Feb 2019 18:52:30 +0000 (13:52 -0500)]
Use adaptive icon shapes for settings homeepage

- Add AdaptiveIconShapeDrawable for the homepage icon backgrounds
- Rename RoundedHomepageIcon -> AdaptiveHomepageIcon to reflect that the
adaptive icon shape is used

Bug: 123829919
Test: mp settings; manually viewing homepage icons
Change-Id: I9fddfbf57461b300200f30f716d861878bbbcc38

5 years agoMerge "Add READ_DEVICE_CONFIG permission to allow use of DeviceConfig API when permis...
Stanislav Zholnin [Tue, 5 Feb 2019 17:07:04 +0000 (17:07 +0000)]
Merge "Add READ_DEVICE_CONFIG permission to allow use of DeviceConfig API when permission checks will be introduced."

5 years agoMerge "Update char limit on prevent ringing titles"
TreeHugger Robot [Tue, 5 Feb 2019 16:50:14 +0000 (16:50 +0000)]
Merge "Update char limit on prevent ringing titles"

5 years agoMerge "Show permission group icons in dark mode."
TreeHugger Robot [Tue, 5 Feb 2019 15:23:50 +0000 (15:23 +0000)]
Merge "Show permission group icons in dark mode."

5 years agoMerge "Check a flag to see whether or not to show permission usage information."
TreeHugger Robot [Tue, 5 Feb 2019 15:23:13 +0000 (15:23 +0000)]
Merge "Check a flag to see whether or not to show permission usage information."

5 years agoUpdate char limit on prevent ringing titles
Beverly [Tue, 5 Feb 2019 15:10:05 +0000 (10:10 -0500)]
Update char limit on prevent ringing titles

Test: manual
Bug: 123025152
Change-Id: Icc0c413d94bae1439a1ac7f1b79b1d8e5a4f0efd

5 years agoMove trust agent toggles to developer options
Vishwath Mohan [Sat, 2 Feb 2019 19:18:30 +0000 (11:18 -0800)]
Move trust agent toggles to developer options

This CL moves two toggles for trust agent extend unlock mode from
Security > Settings to Developer Options instead. It also updates some
of the configuration strings to reflect that this toggles behavior for
trust agents in general.

No new logic is being added here, this simply moves options intended
only for internal dogfooding to a more appropriate location in
preparation for the public Beta.

Bug: 111435975
Bug: 120871688
Test: Manually verified that the settings show up in Developer Options
and work as intended.

Change-Id: I2b6705d50fa783089a5c0dfabf76677af44209f7

5 years agoAdd settings for notification bubbling
Julia Reynolds [Thu, 31 Jan 2019 18:13:30 +0000 (13:13 -0500)]
Add settings for notification bubbling

Globally, as well as at the app and channel level

Test: atest
Bug: 123543052
Change-Id: I1668b592c5d175d77d6a38f35e7576d641175d44

5 years agoRemove duplicate ic_menu_add_white.
Amin Shaikh [Mon, 4 Feb 2019 19:54:41 +0000 (14:54 -0500)]
Remove duplicate ic_menu_add_white.

Bug: 123829919
Test: mp settingsg
Change-Id: I88e0dde22762eb6bc019361222ffe783b1c15133

5 years agoShow permission group icons in dark mode.
Joel Galenson [Mon, 4 Feb 2019 16:00:28 +0000 (08:00 -0800)]
Show permission group icons in dark mode.

Apply the proper tint so that the permission group icons appear in
dark mode.

Change-Id: Ief36e69ed8ae70608f1df79a0e2a17eb79b9f467
Fixes: 123750886
Test: Can see icons in light and dark mode.

5 years agoAdd READ_DEVICE_CONFIG permission to allow use of DeviceConfig API
Stanislav Zholnin [Fri, 1 Feb 2019 13:00:37 +0000 (13:00 +0000)]
Add READ_DEVICE_CONFIG permission to allow use of DeviceConfig API
when permission checks will be introduced.

Test: tested locally with permission checks patched.
Change-Id: I8d6b99edac1c23f27872c0a9ecc99a00db017124

5 years agoUpdate the Hearing Aids Strings
Stanley Tng [Sat, 2 Feb 2019 02:16:30 +0000 (18:16 -0800)]
Update the Hearing Aids Strings

Minor update to the Hearing Aids string by making it plural and also
remove a redundant word "currently".

Bug: 121036176
Test: Compile
Change-Id: I829b8028408f5d07d950580bd4d90ca41bd334f3

5 years agoMerge "More tests for silent status bar setting"
Julia Reynolds [Fri, 1 Feb 2019 20:37:41 +0000 (20:37 +0000)]
Merge "More tests for silent status bar setting"

5 years agoMerge "Make a passthrough drawable for ic_settings_print."
Fan Zhang [Fri, 1 Feb 2019 19:55:52 +0000 (19:55 +0000)]
Merge "Make a passthrough drawable for ic_settings_print."

5 years agoMake a passthrough drawable for ic_settings_print.
Fan Zhang [Fri, 1 Feb 2019 19:41:53 +0000 (11:41 -0800)]
Make a passthrough drawable for ic_settings_print.

Bug: 123711718
Test: visual
Change-Id: I6be16f501522167ea0af58c9eed1c491c3c4525d

5 years agoMerge "Game Driver: Fix EnableForAllApps switch and test"
TreeHugger Robot [Fri, 1 Feb 2019 19:14:03 +0000 (19:14 +0000)]
Merge "Game Driver: Fix EnableForAllApps switch and test"

5 years agoMerge "Add dark theme keywords"
Lucas Dupin [Fri, 1 Feb 2019 18:48:44 +0000 (18:48 +0000)]
Merge "Add dark theme keywords"

5 years agoMerge "Add a metrics for avatar"
TreeHugger Robot [Fri, 1 Feb 2019 18:25:11 +0000 (18:25 +0000)]
Merge "Add a metrics for avatar"

5 years agoMerge "Flags instead of booleans for countPermissionApps"
TreeHugger Robot [Fri, 1 Feb 2019 18:21:33 +0000 (18:21 +0000)]
Merge "Flags instead of booleans for countPermissionApps"

5 years agoMerge "Update call to use new method name."
TreeHugger Robot [Fri, 1 Feb 2019 15:50:51 +0000 (15:50 +0000)]
Merge "Update call to use new method name."

5 years agoMerge "Add dialog for changing display name for mobile network"
TreeHugger Robot [Fri, 1 Feb 2019 04:58:45 +0000 (04:58 +0000)]
Merge "Add dialog for changing display name for mobile network"

5 years agoGame Driver: Fix EnableForAllApps switch and test
Yiwei Zhang [Fri, 1 Feb 2019 02:25:00 +0000 (18:25 -0800)]
Game Driver: Fix EnableForAllApps switch and test

Bug: 123707483
Bug: 119221883
Test: Build, flash, boot and make RunSettingsRoboTests
Change-Id: Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5

5 years agoMerge "Updated arguments for AccessPoint.getSummary calls"
Quang Luong [Fri, 1 Feb 2019 03:43:56 +0000 (03:43 +0000)]
Merge "Updated arguments for AccessPoint.getSummary calls"

5 years agoMerge "Add current user handle to tile intent in account detail page."
TreeHugger Robot [Fri, 1 Feb 2019 02:31:10 +0000 (02:31 +0000)]
Merge "Add current user handle to tile intent in account detail page."

5 years agoAdd a metrics for avatar
Sunny Shao [Wed, 30 Jan 2019 08:06:41 +0000 (16:06 +0800)]
Add a metrics for avatar

Add a metrics log when user click search bar avatar

Change-Id: I389d469cc3fe335ee934d72d642251a6f4fd038b
Fixes: 123560980
Test: compilation

5 years agoMerge "Fix a NPE from incorrect assumption of operation pecedence."
TreeHugger Robot [Fri, 1 Feb 2019 02:19:35 +0000 (02:19 +0000)]
Merge "Fix a NPE from incorrect assumption of operation pecedence."

5 years agoMerge "Remove unused dependency"
TreeHugger Robot [Fri, 1 Feb 2019 01:25:19 +0000 (01:25 +0000)]
Merge "Remove unused dependency"

5 years agoAdd dark theme keywords
Lucas Dupin [Wed, 30 Jan 2019 06:08:25 +0000 (22:08 -0800)]
Add dark theme keywords

Test: make
Change-Id: I0a5bb5e42f419dd6baa80ae06822fb64f6a29cb0
Fixes: 123599254

5 years agoFlags instead of booleans for countPermissionApps
Philip P. Moltmann [Thu, 31 Jan 2019 22:22:24 +0000 (14:22 -0800)]
Flags instead of booleans for countPermissionApps

Test: Checked that the api retunred the results
Bug: 123697839
Change-Id: Iadb1c4307933635e6114d3d32a2a2b1ed87949f4

5 years agoFix a NPE from incorrect assumption of operation pecedence.
Fan Zhang [Thu, 31 Jan 2019 21:48:40 +0000 (13:48 -0800)]
Fix a NPE from incorrect assumption of operation pecedence.

Change-Id: I13d01c39bd3afcfbc7b680b96e0c7eb341fbc584
Fixes: 123709444
Test: robotest

5 years agoMerge "Ignore failing tests"
Fan Zhang [Thu, 31 Jan 2019 21:14:08 +0000 (21:14 +0000)]
Merge "Ignore failing tests"

5 years agoIgnore failing tests
Fan Zhang [Thu, 31 Jan 2019 21:12:56 +0000 (13:12 -0800)]
Ignore failing tests

Bug: 123707483
Test: robotest
Change-Id: Ie18ec3b25b905566e8a8afe90f3a7688cf1141f6

5 years agoUpdated arguments for AccessPoint.getSummary calls
Quang Luong [Wed, 30 Jan 2019 22:04:47 +0000 (14:04 -0800)]
Updated arguments for AccessPoint.getSummary calls

Changed the arguments for getSummary to reflect the changes in
settingslib

Bug: 118705403
Test: none
Change-Id: I2bd02e608a900865ff90dd78463a164fca39c905

5 years agoAdd dialog for changing display name for mobile network
Antony Sargent [Wed, 30 Jan 2019 00:54:03 +0000 (16:54 -0800)]
Add dialog for changing display name for mobile network

This CL adds a pencil/edit icon at the top of the mobile network details
page. When clicked, it brings up a dialog that allows the user to set
the display name used for that mobile network - this is most useful in
multi-SIM situations. This dialog also displays the mobile network
operator name and phone number which can help the user keep straight
which one they are renaming.

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: Ifd63cfb66ce743bd5ba8a06b52229f06ed56b7bd

5 years agoMerge "Allow multiple trust agents"
Vishwath Mohan [Thu, 31 Jan 2019 20:21:40 +0000 (20:21 +0000)]
Merge "Allow multiple trust agents"

5 years agoAllow multiple trust agents
Vishwath Mohan [Tue, 29 Jan 2019 16:26:40 +0000 (08:26 -0800)]
Allow multiple trust agents

This CL is essentially a one-line change that sets the
ONLY_ONE_TRUST_AGENT boolean to false.

Bug: 111431046
Test: Tested manually that this works correctly

Change-Id: Ia8f06235467e3223ef1e441a62d941a64a2d7c93

5 years agoAdd current user handle to tile intent in account detail page.
Doris Ling [Mon, 28 Jan 2019 21:37:31 +0000 (13:37 -0800)]
Add current user handle to tile intent in account detail page.

- the account detail settings page is launched with the correct user
handle when there is work profile to indicate which profile the account
belongs to. When we process the dynamic tile, for the page, we should
add this info to the tile intent, so that it can be launched with the
correct profile.
- when we launch the tile intent, check whether there's user handle
specified. If so, launch the intent directly without prompting for
profile selection.

Change-Id: I91f8c666a826909006b1f53907b3441825322c10
Fixes: 119657694
Test: make RunSettingsRoboTests

5 years agoMerge "Remove dead code from settings"
TreeHugger Robot [Thu, 31 Jan 2019 19:18:17 +0000 (19:18 +0000)]
Merge "Remove dead code from settings"

5 years agoMerge "Connect to network while clicking open or saved networks on slice"
TreeHugger Robot [Thu, 31 Jan 2019 19:14:05 +0000 (19:14 +0000)]
Merge "Connect to network while clicking open or saved networks on slice"

5 years agoRemove unused dependency
Alex Salo [Thu, 31 Jan 2019 01:58:47 +0000 (17:58 -0800)]
Remove unused dependency

Test: not needed
Bug: 111939367
Change-Id: Id6040240e6221fe6311b7985f3763c04989be7d2

5 years agoCheck a flag to see whether or not to show permission usage information.
Joel Galenson [Thu, 24 Jan 2019 16:14:09 +0000 (08:14 -0800)]
Check a flag to see whether or not to show permission usage information.

Bug: 122615235
Test: Manually set/unset flag, see/don't see usage information.
Change-Id: I2d743fc28c5676a2304dac73ae96734241f3fe1d

5 years agoMerge "Use ColorDisplayManager for night display settings"
Christine Franks [Thu, 31 Jan 2019 17:45:45 +0000 (17:45 +0000)]
Merge "Use ColorDisplayManager for night display settings"

5 years agoUpdate call to use new method name.
Joel Galenson [Thu, 31 Jan 2019 16:19:21 +0000 (08:19 -0800)]
Update call to use new method name.

Test: See correct shadow behavior when scrolling app info.
Change-Id: Ib6452f5caa42600330b934c50c30a42f303710ae

5 years agoUpdate proguard
Beverly [Mon, 28 Jan 2019 21:48:06 +0000 (16:48 -0500)]
Update proguard

Test: manual
Bug: 118388808
Bug: 123532083
Change-Id: Ie3140755817989f567b2ea0674ebe601062aae21

5 years agoMerge "Update title for the link to more special app access."
TreeHugger Robot [Thu, 31 Jan 2019 12:34:59 +0000 (12:34 +0000)]
Merge "Update title for the link to more special app access."

5 years agoMerge "If the ramping ringer adaptive volume is enabled then do not show this setting...
TreeHugger Robot [Thu, 31 Jan 2019 06:18:30 +0000 (06:18 +0000)]
Merge "If the ramping ringer adaptive volume is enabled then do not show this setting. It will be injected from settings intelligence with additional user options"

5 years agoMerge "Consolidate wake-screen settings page"
TreeHugger Robot [Thu, 31 Jan 2019 05:30:10 +0000 (05:30 +0000)]
Merge "Consolidate wake-screen settings page"

5 years agoMerge "Change summary of "Privacy" in homepage"
TreeHugger Robot [Thu, 31 Jan 2019 05:18:25 +0000 (05:18 +0000)]
Merge "Change summary of "Privacy" in homepage"

5 years agoMerge "Add enable/disable DSDS setting switch"
Pengquan Meng [Thu, 31 Jan 2019 03:51:49 +0000 (03:51 +0000)]
Merge "Add enable/disable DSDS setting switch"

5 years agoIf the ramping ringer adaptive volume is enabled then do not show
Tajinder Gadh [Wed, 30 Jan 2019 20:48:13 +0000 (12:48 -0800)]
If the ramping ringer adaptive volume is enabled then do not show
this setting. It will be injected from settings intelligence with
additional user options

Test: Build locally and validated
Change-Id: I6f79eea460e86d643d92c04e8ea126b99b9bed8b

5 years agoChange summary of "Privacy" in homepage
tmfang [Thu, 31 Jan 2019 03:27:27 +0000 (11:27 +0800)]
Change summary of "Privacy" in homepage

Test: visual
Change-Id: I79fd96f42cc6ed698d516bb80c14db098b80273a
Fixes: 123537345

5 years agoMerge "Deprecate EXCLUSIVE category from contextual_card_list.proto"
Yanting Yang [Thu, 31 Jan 2019 02:56:41 +0000 (02:56 +0000)]
Merge "Deprecate EXCLUSIVE category from contextual_card_list.proto"

5 years agoRemove dead code from settings
Soonil Nagarkar [Fri, 25 Jan 2019 01:52:19 +0000 (17:52 -0800)]
Remove dead code from settings

Test: manually
Change-Id: I1ef0bb2a20c6c6f020dd051407dda2de87f174ea

5 years agoAdd enable/disable DSDS setting switch
Pengquan Meng [Tue, 29 Jan 2019 03:12:18 +0000 (19:12 -0800)]
Add enable/disable DSDS setting switch

This add a switch settings in the Phone Information screen to allow the
user enable/disable the DSDS mode.

Bug: 123088078
Test: build & manual test
Change-Id: Ia3722fb26ce8825820ee96550a1d523da35c7a71

5 years agoMerge "Add feature flag check for mainline module version."
TreeHugger Robot [Thu, 31 Jan 2019 00:38:07 +0000 (00:38 +0000)]
Merge "Add feature flag check for mainline module version."

5 years agoUpdate title for the link to more special app access.
Hai Zhang [Wed, 30 Jan 2019 23:20:10 +0000 (15:20 -0800)]
Update title for the link to more special app access.

This change updates the title for the link to more special app access
to be "See more".

Bug: 110557011
Bug: 123538149
Test: manual
Change-Id: I17c7aa347f4e584a28ca8f2de8b9f75ee5e3c1b4

5 years agoConsolidate wake-screen settings page
Lucas Dupin [Sat, 19 Jan 2019 00:17:44 +0000 (16:17 -0800)]
Consolidate wake-screen settings page

UX decided to have a single settings page instead of two

Test: manual
Bug: 111414690
Change-Id: I8e0eee3ea00b1eb9cbe534cc60bfccec43cf8e31

5 years agoMerge "Use role for App info default phone shortcut."
TreeHugger Robot [Wed, 30 Jan 2019 22:23:40 +0000 (22:23 +0000)]
Merge "Use role for App info default phone shortcut."

5 years agoUse correct uid when querying usage data for specific user.
Doris Ling [Wed, 30 Jan 2019 19:22:45 +0000 (11:22 -0800)]
Use correct uid when querying usage data for specific user.

- the data usage list shows usage data for each app, and also the
aggregated data for work apps and other user. When user clicks on the
app item, we will shows the detail usage data for that item using the
app item key. However, if the app item is not for app but for user, the
key will not be the app uid, but a key built from the user id. So,
querying using the key will not get any data.
- for app item corresponding for user, need to sum up all usage data
for the uids associated with the user.

Change-Id: I1a185ee6b4d59e477f3a03cade97d85d6982e416
Fixes: 122200400
Test: make RunSettingsRoboTests

5 years agoAdd developer option for device identifier restrictions
Michael Groover [Wed, 30 Jan 2019 21:14:56 +0000 (13:14 -0800)]
Add developer option for device identifier restrictions

Bug: 123646983
Test: Manually verified device_config switch was toggled via
      the new developer option.

Change-Id: I6a4e2d1f7bfdaae402e594e7ebc1b845bf12996e

5 years agoAdd feature flag check for mainline module version.
Doris Ling [Wed, 30 Jan 2019 20:52:23 +0000 (12:52 -0800)]
Add feature flag check for mainline module version.

- in about phone settings, only show the mainline module version if the
feature is enabled.

Bug: 122615240
Test: make RunSettingsRoboTests
Change-Id: If872859755dade7e601a47eb387d10c3b247d06e

5 years agoMerge "Revert "Add live caption preference in accessibility page.""
Fan Zhang [Wed, 30 Jan 2019 20:14:22 +0000 (20:14 +0000)]
Merge "Revert "Add live caption preference in accessibility page.""

5 years agoMerge "Add Secure NFC functionality"
Ruchi Kandoi [Wed, 30 Jan 2019 18:58:50 +0000 (18:58 +0000)]
Merge "Add Secure NFC functionality"

5 years agoMerge "Add referrer when launching search intent."
TreeHugger Robot [Wed, 30 Jan 2019 18:57:28 +0000 (18:57 +0000)]
Merge "Add referrer when launching search intent."

5 years agoRevert "Add live caption preference in accessibility page."
Fan Zhang [Wed, 30 Jan 2019 18:10:17 +0000 (18:10 +0000)]
Revert "Add live caption preference in accessibility page."

This reverts commit d64901494fb4bd2f195d8c6da7258f107207eebf.

Reason for revert: b/123636344

Change-Id: If6307935ba3613cb24f5bab2234febef83c6f7d2

5 years agoMore tests for silent status bar setting
Julia Reynolds [Wed, 30 Jan 2019 15:28:22 +0000 (10:28 -0500)]
More tests for silent status bar setting

Test: this
Change-Id: I2f1890a4843438684c089b837cf74bd520b352e6
Fixes: 123419917

5 years agoMerge "[Multi-user] Change Backup Settings page to support multi-user."
Chandan Nath [Wed, 30 Jan 2019 14:03:38 +0000 (14:03 +0000)]
Merge "[Multi-user] Change Backup Settings page to support multi-user."

5 years agoMerge "Add silent status bar icon setting"
Julia Reynolds [Wed, 30 Jan 2019 13:41:08 +0000 (13:41 +0000)]
Merge "Add silent status bar icon setting"

5 years agoMerge "Fix crash if timezone is changed and "Don't keep activities" mode is on"
TreeHugger Robot [Wed, 30 Jan 2019 10:59:36 +0000 (10:59 +0000)]
Merge "Fix crash if timezone is changed and "Don't keep activities" mode is on"

5 years agoMerge "Revert "Wifi MAC Randomization: Developer Options""
Oscar Shu [Wed, 30 Jan 2019 10:55:34 +0000 (10:55 +0000)]
Merge "Revert "Wifi MAC Randomization: Developer Options""

5 years agoDeprecate EXCLUSIVE category from contextual_card_list.proto
Yanting Yang [Wed, 30 Jan 2019 10:52:33 +0000 (18:52 +0800)]
Deprecate EXCLUSIVE category from contextual_card_list.proto

Bug: 120485678
Test: visual, robotests
Change-Id: Ic287aeeed0743787d3e577c7086e9847b5c33157

5 years agoConnect to network while clicking open or saved networks on slice
Jason Chiu [Tue, 29 Jan 2019 09:13:28 +0000 (17:13 +0800)]
Connect to network while clicking open or saved networks on slice

Test: make RunSettingsRoboTests -j
Fixes: 121342770
Change-Id: I0ffb925628dd271d054f990b9b176eb10372e6a3

5 years agoMerge "Remove empty space in Usage access"
TreeHugger Robot [Wed, 30 Jan 2019 07:04:25 +0000 (07:04 +0000)]
Merge "Remove empty space in Usage access"

5 years agoMerge "Wi-Fi DPP code refine"
TreeHugger Robot [Wed, 30 Jan 2019 05:00:38 +0000 (05:00 +0000)]
Merge "Wi-Fi DPP code refine"

5 years agoMerge "ConfirmDeviceCredential should default to setRequireConfirmation(true)"
TreeHugger Robot [Wed, 30 Jan 2019 04:49:37 +0000 (04:49 +0000)]
Merge "ConfirmDeviceCredential should default to setRequireConfirmation(true)"

5 years agoMerge "Use settingslib ActionBarShadowController"
TreeHugger Robot [Wed, 30 Jan 2019 04:29:44 +0000 (04:29 +0000)]
Merge "Use settingslib ActionBarShadowController"

5 years agoMerge "Schematize Crypto system properties"
TreeHugger Robot [Wed, 30 Jan 2019 03:51:31 +0000 (03:51 +0000)]
Merge "Schematize Crypto system properties"

5 years agoMerge "Use API to get necessary value when activity init"
Les Lee [Wed, 30 Jan 2019 03:42:55 +0000 (03:42 +0000)]
Merge "Use API to get necessary value when activity init"

5 years agoMerge "Remove cardview wrapper on condition collapse button."
TreeHugger Robot [Wed, 30 Jan 2019 03:37:42 +0000 (03:37 +0000)]
Merge "Remove cardview wrapper on condition collapse button."