OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Add Default backup page to list of allowed fragments." into pi-dev
Ben Lin [Wed, 21 Mar 2018 01:18:44 +0000 (01:18 +0000)]
Merge "Add Default backup page to list of allowed fragments." into pi-dev
am: 048b71a67c

Change-Id: Ib89ba0f96f650f36cc5286ce48e0bd0df1d79ad5

6 years agoMerge "Add log for battery tip action." into pi-dev
Lei Yu [Tue, 20 Mar 2018 23:37:52 +0000 (23:37 +0000)]
Merge "Add log for battery tip action." into pi-dev
am: 09ed2f2596

Change-Id: I4ba9fd91330415ed0f77bb3e4dcd19f47ce2090f

6 years agoMerge "Add an Advanced button to location settings" into pi-dev
Maggie Wang [Tue, 20 Mar 2018 23:28:01 +0000 (23:28 +0000)]
Merge "Add an Advanced button to location settings" into pi-dev
am: ff912223b7

Change-Id: Iaa51d5f9c3e2e4785183f667b47391a652089d60

6 years agoMerge "Fix user id is not used correctly when fetching app info" into pi-dev
Tony Mak [Tue, 20 Mar 2018 22:56:51 +0000 (22:56 +0000)]
Merge "Fix user id is not used correctly when fetching app info" into pi-dev
am: ea43e8285e

Change-Id: I11bd697b6243bfe85617d9edadf680d7c35e1427

6 years agoMerge "Add Default backup page to list of allowed fragments." into pi-dev
Ben Lin [Tue, 20 Mar 2018 22:22:18 +0000 (22:22 +0000)]
Merge "Add Default backup page to list of allowed fragments." into pi-dev

6 years agoMerge "Indicate when accessibility services have stopped" into pi-dev
Phil Weaver [Tue, 20 Mar 2018 21:52:56 +0000 (21:52 +0000)]
Merge "Indicate when accessibility services have stopped" into pi-dev
am: 656aad9c93

Change-Id: I850746d339b79b5fa8353ded4a6fea05a7f5f32c

6 years agoMerge "Update metered string" into pi-dev
Salvador Martinez [Tue, 20 Mar 2018 21:51:43 +0000 (21:51 +0000)]
Merge "Update metered string" into pi-dev
am: f9dade022c

Change-Id: I135eb619e7aa94e1f767cb8f5662286a86c91760

6 years agoMerge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
Hansong Zhang [Tue, 20 Mar 2018 21:35:05 +0000 (21:35 +0000)]
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
am: 012e04fa02

Change-Id: Ia4c21f5d21f40b9a17e0b7ae6eb65ab6a8ad08ff

6 years agoMerge "Show "Doesn't support work profiles" text in Settings for launchers not suppor...
Antoan Angelov [Tue, 20 Mar 2018 21:34:22 +0000 (21:34 +0000)]
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev
am: 1bc98edc15

Change-Id: I9adcbcba0c8c72d7f459e7e7d3639686df2b944d

6 years agoMerge "UI Tweak for eSIM related" into pi-dev
Qingxi Li [Tue, 20 Mar 2018 21:33:53 +0000 (21:33 +0000)]
Merge "UI Tweak for eSIM related" into pi-dev
am: 2a6b9ff315

Change-Id: I286216110518f2143bbddf943b24e560f1e8a192

6 years agoMerge "Add log for battery tip action." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)]
Merge "Add log for battery tip action." into pi-dev

6 years agoMerge "Add an Advanced button to location settings" into pi-dev
Maggie Wang [Tue, 20 Mar 2018 20:44:23 +0000 (20:44 +0000)]
Merge "Add an Advanced button to location settings" into pi-dev

6 years agoMerge "Remove "don't show" option from work notifications settings" into pi-dev
Pavel Grafov [Tue, 20 Mar 2018 20:24:22 +0000 (20:24 +0000)]
Merge "Remove "don't show" option from work notifications settings" into pi-dev
am: be3e5caa7f

Change-Id: I2e7bc6a3494d58569944d5d7ee36fe91ca1c4863

6 years agoMerge "Fix user id is not used correctly when fetching app info" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:24:17 +0000 (20:24 +0000)]
Merge "Fix user id is not used correctly when fetching app info" into pi-dev

6 years agoMerge "Indicate when accessibility services have stopped" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:16:09 +0000 (20:16 +0000)]
Merge "Indicate when accessibility services have stopped" into pi-dev

6 years agoMerge "Update metered string" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:05:07 +0000 (20:05 +0000)]
Merge "Update metered string" into pi-dev

6 years agoMerge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 19:56:51 +0000 (19:56 +0000)]
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev

6 years agoMerge "Show "Doesn't support work profiles" text in Settings for launchers not suppor...
Antoan Angelov [Tue, 20 Mar 2018 19:33:17 +0000 (19:33 +0000)]
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev

6 years agoMerge "Fix lockdown string" into pi-dev
Chad Brubaker [Tue, 20 Mar 2018 19:30:27 +0000 (19:30 +0000)]
Merge "Fix lockdown string" into pi-dev
am: 91b6d17b8d

Change-Id: I70c2f9cb56da14cd56e0b799b3b815bd54642bad

6 years agoMerge "UI Tweak for eSIM related" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 19:24:59 +0000 (19:24 +0000)]
Merge "UI Tweak for eSIM related" into pi-dev

6 years agoMerge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
Andrew Sapperstein [Tue, 20 Mar 2018 19:10:46 +0000 (19:10 +0000)]
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
am: a3970d4e52

Change-Id: I6d41d2c9cf285a587c4e5b264251da3da80e7071

6 years agoMerge "Remove "don't show" option from work notifications settings" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:41:13 +0000 (18:41 +0000)]
Merge "Remove "don't show" option from work notifications settings" into pi-dev

6 years agoMerge "Fix lockdown string" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:19:09 +0000 (18:19 +0000)]
Merge "Fix lockdown string" into pi-dev

6 years agoAdd an Advanced button to location settings
Maggie [Thu, 15 Mar 2018 19:10:18 +0000 (12:10 -0700)]
Add an Advanced button to location settings

Add an Advanced button under "recent location requests" and "app level
permissions" in location settings.
Location footer should still be visible under Advanced button.

Bug: 70350519
Test: Manual
Change-Id: I5db32e911ed6527048c625f691f5476eb77751b3

6 years agoUpdate metered string
Salvador Martinez [Tue, 20 Mar 2018 17:27:21 +0000 (10:27 -0700)]
Update metered string

This CL updates the metered network string to say
'detect automatically' instead of 'network preference'

Bug: 68030417
Test: rototest, visual inspection
Change-Id: I347e3b89b014d7ec0d5d0e6601f2813a3a96f5ab

6 years agoMove the setActiveDevice logic from Settings to SettingsLib (2/2)
Hansong Zhang [Tue, 20 Mar 2018 01:21:40 +0000 (18:21 -0700)]
Move the setActiveDevice logic from Settings to SettingsLib (2/2)

Currently the Settings app handles the logic of setting active device;
however, this should be handled by SettingsLib so the logic can be shared.

Bug: 75984255
Test: robolectric test

Change-Id: I5742de1463d156ff29708ea2aecfc3fd00795e9e

6 years agoMerge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 17:11:51 +0000 (17:11 +0000)]
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev

6 years agoShow "Doesn't support work profiles" text in Settings for launchers not
arangelov [Tue, 20 Mar 2018 14:53:55 +0000 (14:53 +0000)]
Show "Doesn't support work profiles" text in Settings for launchers not
supporting work profiles.

Screenshot: https://screenshot.googleplex.com/iz3xoeSvbOA.png

Test: Manually go to Settings -> Apps & notifications -> Default apps -> Home app.
Test: make ROBOTEST_FILTER=RadioButtonPreferenceTest -j40 RunSettingsRoboTests
Bug: 69297461
Change-Id: I55c721d7ad979c882bb879a974758cf08eaf0c86

6 years agoRemove "don't show" option from work notifications settings
Pavel Grafov [Mon, 11 Sep 2017 14:46:46 +0000 (15:46 +0100)]
Remove "don't show" option from work notifications settings

Option to not show notifications is still available for
device-wide locks screen notification settings.

Also s/On lock screen/When work profile is locked/ for work
notifications since it applies not only to lock screen but to
notification shade as well.

Bug: 64829587
Test: make RunSettingsRoboTests
Change-Id: Ie3ec461f4c8887a5a49cd92b5350ea683f701027

6 years agoMerge "Remove touch effect of Ratio on listitem" into pi-dev
HJ ChangLiao [Tue, 20 Mar 2018 14:20:04 +0000 (14:20 +0000)]
Merge "Remove touch effect of Ratio on listitem" into pi-dev
am: a976a0eaad

Change-Id: Id8226bd927f8553335e88cce4bd3fe4a2d81833b

6 years agoMerge "Remove touch effect of Ratio on listitem" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 14:07:26 +0000 (14:07 +0000)]
Merge "Remove touch effect of Ratio on listitem" into pi-dev

6 years agoMake the preference not selectable
Yvonne Yang [Tue, 20 Mar 2018 11:37:31 +0000 (11:37 +0000)]
Make the preference not selectable
am: 7ac7d7b660

Change-Id: I2a3f289bbf5881d99674b9b8af5eb61dad04b508

6 years agoAdd Default backup page to list of allowed fragments.
Ben Lin [Tue, 20 Mar 2018 10:25:08 +0000 (03:25 -0700)]
Add Default backup page to list of allowed fragments.

Bug: 75990141
Test: Attempting to invoke ToggleBackupSettingsFragment via XML maifest
changes works.

Change-Id: Idb00fafa998908c8d1c679054cf93c279f60913d

6 years agoMake the preference not selectable
Yvonne Yang [Fri, 16 Mar 2018 08:48:42 +0000 (16:48 +0800)]
Make the preference not selectable

"Battery usage data isn't available" should not respond to taps

Bug: 69312966
Test: Manual test
Change-Id: Id450c5a6089a4fb78a5c48a0f460992dc89f49ec

6 years agoMerge "Reword settings suggestion tile text for airplane mode" into pi-dev
Antony Sargent [Tue, 20 Mar 2018 06:46:06 +0000 (06:46 +0000)]
Merge "Reword settings suggestion tile text for airplane mode" into pi-dev
am: cbf9300cd2

Change-Id: Ic2feab06f0d9aeb9e9b404747e7bd6fb44f40ac3

6 years agoMerge "Reword settings suggestion tile text for airplane mode" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 06:37:35 +0000 (06:37 +0000)]
Merge "Reword settings suggestion tile text for airplane mode" into pi-dev

6 years agoMerge "Add "take call on" string for audio output switcher." into pi-dev
ryanywlin [Tue, 20 Mar 2018 06:06:35 +0000 (06:06 +0000)]
Merge "Add "take call on" string for audio output switcher." into pi-dev
am: cd908497d6

Change-Id: I7d05037db8d57e9dc891f195d06da18ae529d5c2

6 years agoMerge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev
Andreas Terzis [Tue, 20 Mar 2018 06:05:54 +0000 (06:05 +0000)]
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev
am: 91ea3c5e56

Change-Id: I17360c93f650a7f9705295961ce4459d9acb32dd

6 years agoMerge "Add "take call on" string for audio output switcher." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 05:52:06 +0000 (05:52 +0000)]
Merge "Add "take call on" string for audio output switcher." into pi-dev

6 years agoMerge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev
Andreas Terzis [Tue, 20 Mar 2018 05:49:51 +0000 (05:49 +0000)]
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev

6 years agoMerge "Add summary for battery manager preference" into pi-dev
Lei Yu [Tue, 20 Mar 2018 05:23:20 +0000 (05:23 +0000)]
Merge "Add summary for battery manager preference" into pi-dev
am: 06d5188a71

Change-Id: I69d1a30f9d6ae1682b806c80a976ddad1f37c3c2

6 years agoMerge "Update string for battery seekbar" into pi-dev
Lei Yu [Tue, 20 Mar 2018 05:22:36 +0000 (05:22 +0000)]
Merge "Update string for battery seekbar" into pi-dev
am: 8916df573d

Change-Id: I35400bdfe84594be938373a28fd9c660a34cce3f

6 years agoMerge "Fixing settings crash when no default home app is set" into pi-dev
Sunny Goyal [Tue, 20 Mar 2018 05:22:09 +0000 (05:22 +0000)]
Merge "Fixing settings crash when no default home app is set" into pi-dev
am: ee2ac81999

Change-Id: Ie74613b09179d9c518139cfc597ad62479d9d7c5

6 years agoMerge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev
hughchen [Tue, 20 Mar 2018 05:21:34 +0000 (05:21 +0000)]
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev
am: 138bdf6030

Change-Id: I80fba5f82a2b75a88660478cc91077db648f8204

6 years agoMerge "Add new string for audio switch" into pi-dev
timhypeng [Tue, 20 Mar 2018 05:20:51 +0000 (05:20 +0000)]
Merge "Add new string for audio switch" into pi-dev
am: 73f1a3180a

Change-Id: Ib10a001446f04bbbd0e5a7a127a777a8d1a43184

6 years agoMerge "Make "minimal" pattern layout sw320dp" into pi-dev
Maurice Lam [Tue, 20 Mar 2018 05:20:05 +0000 (05:20 +0000)]
Merge "Make "minimal" pattern layout sw320dp" into pi-dev
am: b98eea4c67

Change-Id: I54ae0434ed07e0bb2842317d91cc6c8b5af8406b

6 years agoMerge "Update switch bar summary for spell checker page" into pi-dev
Fan Zhang [Tue, 20 Mar 2018 05:19:17 +0000 (05:19 +0000)]
Merge "Update switch bar summary for spell checker page" into pi-dev
am: 39b54ea1f8

Change-Id: I66bcfd8f0bf5ddcebeca14cb5c1103278ff3a97f

6 years agoMerge "Remove ops preference from specific app" into pi-dev
HJ ChangLiao [Tue, 20 Mar 2018 05:17:57 +0000 (05:17 +0000)]
Merge "Remove ops preference from specific app" into pi-dev
am: ac20e2d511

Change-Id: I0eb1403ecaaed7d2cfa932a0228e707653623a16

6 years agoMerge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
jdesprez [Tue, 20 Mar 2018 04:54:41 +0000 (04:54 +0000)]
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
am: a2da6221c0

Change-Id: I59ed1b0b9bc8ee262f9bc1602ab03773e9f71026

6 years agoMerge "Add summary for battery manager preference" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 04:36:48 +0000 (04:36 +0000)]
Merge "Add summary for battery manager preference" into pi-dev

6 years agoMerge "Update string for battery seekbar" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 04:32:51 +0000 (04:32 +0000)]
Merge "Update string for battery seekbar" into pi-dev

6 years agoMerge "Fixing settings crash when no default home app is set" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 04:32:10 +0000 (04:32 +0000)]
Merge "Fixing settings crash when no default home app is set" into pi-dev

6 years agoMerge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 04:09:27 +0000 (04:09 +0000)]
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev

6 years agoMerge "Add new string for audio switch" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 04:08:27 +0000 (04:08 +0000)]
Merge "Add new string for audio switch" into pi-dev

6 years agoMerge "Make "minimal" pattern layout sw320dp" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 03:30:42 +0000 (03:30 +0000)]
Merge "Make "minimal" pattern layout sw320dp" into pi-dev

6 years agoAdd "take call on" string for audio output switcher.
ryanywlin [Fri, 16 Mar 2018 08:16:35 +0000 (16:16 +0800)]
Add "take call on" string for audio output switcher.

Bug: 74130772
Test: rebuild

Change-Id: I652015e0e051a37e8df2d8f7d04b2acbcc2bdaf6

6 years agoMerge "Update switch bar summary for spell checker page" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 02:58:38 +0000 (02:58 +0000)]
Merge "Update switch bar summary for spell checker page" into pi-dev

6 years agoMerge "update "Last full charge" preference" into pi-dev
Lei Yu [Tue, 20 Mar 2018 02:57:55 +0000 (02:57 +0000)]
Merge "update "Last full charge" preference" into pi-dev
am: de0a3a5334

Change-Id: I8b7ef49bc738f88cf36d31208e5370a292eb23b5

6 years agoMerge "Remove ops preference from specific app" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 02:35:21 +0000 (02:35 +0000)]
Merge "Remove ops preference from specific app" into pi-dev

6 years agoUpdating special Settings Wi-Fi strings
xshu [Tue, 20 Mar 2018 02:35:02 +0000 (02:35 +0000)]
Updating special Settings Wi-Fi strings
am: e0a6d1640a

Change-Id: Ic9c587ed88b22d16f8f6ca1dca61bdcccf4214ff

6 years agoAdd summary for battery manager preference
Lei Yu [Fri, 16 Mar 2018 20:25:53 +0000 (13:25 -0700)]
Add summary for battery manager preference

Show different summary based on whether it is on and there is restricted
apps.

Also move method to get restricted app list to BatteryTipUtils since it
is used in 2 places.

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib2306e0fd1f520fde6d1403ce9c527c241d36005

6 years agoUpdate string for battery seekbar
Lei Yu [Tue, 20 Mar 2018 01:01:27 +0000 (18:01 -0700)]
Update string for battery seekbar

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I7661fb8d324ae5df468e03d2940a48e03952e3cb

6 years agoMerge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 02:13:47 +0000 (02:13 +0000)]
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev

6 years agoFixing settings crash when no default home app is set
Sunny Goyal [Wed, 14 Mar 2018 20:46:54 +0000 (13:46 -0700)]
Fixing settings crash when no default home app is set

Test: make -j20 RunSettingsRoboTests
Bug: 74519090
Change-Id: I8846bae1f0083be981cfde9a68291c1b01359228

6 years agoChange BatteryUtils.isLegacyApp() to isPreOApp()
hughchen [Wed, 14 Mar 2018 08:16:26 +0000 (16:16 +0800)]
Change BatteryUtils.isLegacyApp() to isPreOApp()

Bug: 73792442
Test: RunSettingsRoboTests
      make -j40 RunSettingsRoboTests
Change-Id: I770030a8f38ec6156aa2a40f4c88ac9e0673751d

6 years agoUpdate switch bar summary for spell checker page
Fan Zhang [Mon, 19 Mar 2018 22:58:48 +0000 (15:58 -0700)]
Update switch bar summary for spell checker page

Change-Id: If48ad81e5ad5e4a7bd65ede5ed67d28250fbe8ed
Fixes: 75277295
Test: atest SpellCheckerSettingsUITest

6 years agoIndicate when accessibility services have stopped
Phil Weaver [Tue, 13 Mar 2018 17:18:50 +0000 (10:18 -0700)]
Indicate when accessibility services have stopped

Bug: 35219990
Test: Created an accessibility service that crashes, and
then verified that the new status is reflected in
Settings.
Change-Id: I676c8e87f7642366a51b139f46cf8e3094a58d50

6 years agoMerge "update "Last full charge" preference" into pi-dev
Lei Yu [Tue, 20 Mar 2018 00:33:29 +0000 (00:33 +0000)]
Merge "update "Last full charge" preference" into pi-dev

6 years agoMerge "Split "Mobile Network Type" indication in Settings" into pi-dev
Hall Liu [Tue, 20 Mar 2018 00:16:45 +0000 (00:16 +0000)]
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
am: 8837f992bb

Change-Id: I41aec9f11b1e34cd56681b171a587bddb539f54e

6 years agoUpdating special Settings Wi-Fi strings
xshu [Fri, 16 Mar 2018 18:41:24 +0000 (11:41 -0700)]
Updating special Settings Wi-Fi strings

Bug: 74356729
Test: compile

Manually inspected the affected UI pages

Change-Id: I6905dce8f3d6c4acbddedccbf0401b9ef6bba53b

6 years agoMerge "Update the mechanism to upload new anomaly config" into pi-dev
Lei Yu [Mon, 19 Mar 2018 23:47:10 +0000 (23:47 +0000)]
Merge "Update the mechanism to upload new anomaly config" into pi-dev
am: d06991821f

Change-Id: Icdeb6c116a320fdfc661c2ce27b01a6f8f806f17

6 years agoMerge "Update string for dwell click timing" into pi-dev
Phil Weaver [Mon, 19 Mar 2018 23:37:03 +0000 (23:37 +0000)]
Merge "Update string for dwell click timing" into pi-dev
am: c10659cee7

Change-Id: I242b3787680ffa75dfc6294ae4c6d893025d37fc

6 years agoRemove LinearColorBar and replace uses with ProgressBar.
Andrew Sapperstein [Sun, 18 Mar 2018 22:53:09 +0000 (15:53 -0700)]
Remove LinearColorBar and replace uses with ProgressBar.

We never actually needed it, since progress bar can do
everything we want it to. Renamed data_usage_progress to
color_bar_progress to reflect its more generic state.

Updated color_bar_progress to use proper values.
Since we can't seem to use private attrs in settings,
use the dimen/color values that are customizable.

Updated usages to use regular ProgressBar APIs.

Fixes: 74111937
Test: visual inspection and robotests
Change-Id: I4f0c59e6cf5c629e3cc3901800d9c4afc95fa495

6 years agoUpdate AndroidTest.xml to be APCT suite ready
jdesprez [Mon, 19 Mar 2018 21:46:45 +0000 (14:46 -0700)]
Update AndroidTest.xml to be APCT suite ready

Test: atest SettingsUITests
Bug: 74440293
Change-Id: Id7940589a5cd216668ab4664bb802faaf70b5f68

6 years agoMerge "Split "Mobile Network Type" indication in Settings" into pi-dev
Hall Liu [Mon, 19 Mar 2018 21:15:26 +0000 (21:15 +0000)]
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev

6 years agoIn Data Usage screen, hide data bar if plan is unlimited
Jan Nordqvist [Mon, 19 Mar 2018 16:58:11 +0000 (09:58 -0700)]
In Data Usage screen, hide data bar if plan is unlimited

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I1314bdf9748c55a2391ccb39ff66c3dcb133be7e

6 years agoFix user id is not used correctly when fetching app info
Tony Mak [Mon, 19 Mar 2018 15:37:21 +0000 (15:37 +0000)]
Fix user id is not used correctly when fetching app info

FIXES: 73994288
Test: m -j RunSettingsRoboTest
Test: Install an app in work profile, set it to be restricted,
      observe that the app is rendered properly in restricted app list

Change-Id: Ic8a79eb3d0a675f9d1cae3125e8006739e492966

6 years agoMerge "Update the mechanism to upload new anomaly config" into pi-dev
Lei Yu [Mon, 19 Mar 2018 20:20:15 +0000 (20:20 +0000)]
Merge "Update the mechanism to upload new anomaly config" into pi-dev

6 years agoupdate "Last full charge" preference
Lei Yu [Fri, 16 Mar 2018 22:26:33 +0000 (15:26 -0700)]
update "Last full charge" preference

When there is average time estimation, change it to "Full charge lasts
about" and also update the time.

Also update the BatteryInfo to return average time estimation even
though it is charging.

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib22dadb5716e3034c60aeeb7768fdbf0cc86be0c

6 years agoMerge "Update string for dwell click timing" into pi-dev
Phil Weaver [Mon, 19 Mar 2018 19:58:02 +0000 (19:58 +0000)]
Merge "Update string for dwell click timing" into pi-dev

6 years agoMerge "Remove dupe key in UniquePreferenceTest" into pi-dev
Lei Yu [Mon, 19 Mar 2018 19:34:51 +0000 (19:34 +0000)]
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev
am: dcf7b68920

Change-Id: I0bdf645ed8a067dff853b063ff99b1013d85830b

6 years agoMerge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
Jong Wook Kim [Mon, 19 Mar 2018 19:15:17 +0000 (19:15 +0000)]
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
am: 8a022d8693

Change-Id: Id2c0523182ccbfb629f9a296bb8b6117651f2b4e

6 years agoMerge "In Data Usage screen, Above the data bar, Change font size of number." into...
Jan Nordqvist [Mon, 19 Mar 2018 19:06:11 +0000 (19:06 +0000)]
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
am: 9e1226e431

Change-Id: I5fd67fc34ed244178b6c6a9919761ceaa6087239

6 years agoMerge "Remove dupe key in UniquePreferenceTest" into pi-dev
Lei Yu [Mon, 19 Mar 2018 18:45:08 +0000 (18:45 +0000)]
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev

6 years agoMake "minimal" pattern layout sw320dp
Maurice Lam [Fri, 16 Mar 2018 23:26:42 +0000 (16:26 -0700)]
Make "minimal" pattern layout sw320dp

The minimal layout was sw400dp, but some smaller phones still have
enough space to display the icon and button decently, so we're
reducing the trigger threshold for the "minimal" layout to sw320dp.

Test: m -j RunSettingsRoboTests
Bug: 74527018
Change-Id: Ibfca1828870058301cca302554ce3d932c8ba70b

6 years agoMerge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
Jong Wook Kim [Mon, 19 Mar 2018 18:14:08 +0000 (18:14 +0000)]
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev

6 years agoMerge "In Data Usage screen, Above the data bar, Change font size of number." into...
Jan Nordqvist [Mon, 19 Mar 2018 18:05:44 +0000 (18:05 +0000)]
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 19 Mar 2018 17:47:02 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: 8aff2f8fe7  -s ours

Change-Id: I63ed30b348c6c5858a2b4153f6d24ebeb2e5e047

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:07:14 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "In Network & internet screen, hide summary under Data usage when there is...
Jan Nordqvist [Mon, 19 Mar 2018 16:15:50 +0000 (16:15 +0000)]
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
am: 44e5941757

Change-Id: If3957fd7264882e71c73163e9931bea24da5a466

6 years agoMerge "In Network & internet screen, hide summary under Data usage when there is...
Jan Nordqvist [Mon, 19 Mar 2018 16:04:23 +0000 (16:04 +0000)]
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev

6 years agoMerge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
Andreas Terzis [Mon, 19 Mar 2018 14:30:08 +0000 (14:30 +0000)]
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
am: 895f785470

Change-Id: Ib3f59b7c930f909e80e2f61dd4c3f54ffda5821a

6 years agoMerge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
Andreas Terzis [Mon, 19 Mar 2018 14:22:51 +0000 (14:22 +0000)]
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 19 Mar 2018 14:17:36 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6421ebc38133f014551740dd9974dbb687a13b2d

6 years agoRemove touch effect of Ratio on listitem
HJ ChangLiao [Mon, 19 Mar 2018 05:22:56 +0000 (13:22 +0800)]
Remove touch effect of Ratio on listitem

Remove the ripple touch effect of RatioButton,
at Network ratings provider settings page.

Change-Id: Iba067450901572492df68974bdfc14c9ef09a655
Fixes: 70818673
Test: Manual test

6 years agoAdd new string for audio switch
timhypeng [Thu, 15 Mar 2018 10:43:01 +0000 (18:43 +0800)]
Add new string for audio switch

Bug: 74134939
Test: make -j32 RunSettingsRoboTests

Change-Id: Iebbe0f69e22bca97f2ead47e4bae3d45ca9917a3

6 years agoDisplay "MAC address is randomized" in Wifi Preference Page
Jong Wook Kim [Wed, 14 Mar 2018 07:56:20 +0000 (00:56 -0700)]
Display "MAC address is randomized" in Wifi Preference Page

When Connected MAC Randomization is enabled and the device is
disconnected, there isn't a valid MAC address to display since we don't
know what the device's next MAC address is going to be.

Instead of displaying the MAC address used for previous connection, tell
users that "MAC address is randomized."

Bug: 73663275
Test: make -j40 RunSettingsRoboTests
Change-Id: Id5352926f221e3215734d1c198f2072940f82695

6 years agoMerge "Add placeholder on DND settings screen" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 14:35:15 +0000 (14:35 +0000)]
Merge "Add placeholder on DND settings screen" into pi-dev
am: b0f251597c

Change-Id: Ia8394bc0b16365ddf9f312810f251769093b7015

6 years agoMerge "Add placeholder on DND settings screen" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 14:28:41 +0000 (14:28 +0000)]
Merge "Add placeholder on DND settings screen" into pi-dev

6 years agoRemove dupe key in UniquePreferenceTest
Lei Yu [Sat, 17 Mar 2018 01:19:17 +0000 (18:19 -0700)]
Remove dupe key in UniquePreferenceTest

The duplicate page already removed in b/70848054, we need to update
the test.

Change-Id: Ia1f313d211e7528311e56596dbab152aad54bf22
Fixes: 70848054
Test: runtest -x UniquePreferenceTest