OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Auto time should show dynamic subtext when restricted." into pi-dev
yuemingw [Tue, 27 Mar 2018 08:37:28 +0000 (08:37 +0000)]
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
am: d7ea524e81

Change-Id: I161487aff5d83975c6c0e647e8405fab89376f9e

6 years agoMerge "Auto time should show dynamic subtext when restricted." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 08:30:20 +0000 (08:30 +0000)]
Merge "Auto time should show dynamic subtext when restricted." into pi-dev

6 years agoMerge "Fix issue "open battery settings, switch locale, apps are still in old locale...
Wenhung Teng [Tue, 27 Mar 2018 06:26:57 +0000 (06:26 +0000)]
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
am: 032b0454f8

Change-Id: I4676626f12b340752bd867c73d45eda5d0124a1c

6 years agoMerge "Fix issue "open battery settings, switch locale, apps are still in old locale...
Wenhung Teng [Tue, 27 Mar 2018 06:13:53 +0000 (06:13 +0000)]
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev

6 years agoMerge "Observe NetworkCallback instead of polling" into pi-dev
Adam Newman [Tue, 27 Mar 2018 05:48:04 +0000 (05:48 +0000)]
Merge "Observe NetworkCallback instead of polling" into pi-dev
am: d2fb46eac4

Change-Id: Id06fb42bf1144fa3f04d092718427d484557732f

6 years agoMerge "Observe NetworkCallback instead of polling" into pi-dev
Adam Newman [Tue, 27 Mar 2018 05:23:21 +0000 (05:23 +0000)]
Merge "Observe NetworkCallback instead of polling" into pi-dev

6 years agoMerge "Use custom drawable for Battery saver condition icon." into pi-dev
Fan Zhang [Tue, 27 Mar 2018 04:34:46 +0000 (04:34 +0000)]
Merge "Use custom drawable for Battery saver condition icon." into pi-dev
am: 74ac3b1f3a

Change-Id: I74be965dce1442a532c13590b105e43ec078c87c

6 years agoMerge "Update Bluetooth related string" into pi-dev
Jyun LuoLai [Tue, 27 Mar 2018 04:28:56 +0000 (04:28 +0000)]
Merge "Update Bluetooth related string" into pi-dev
am: 198a6495ad

Change-Id: Icb0cdc09c6c0ccb1d359ff4b5e0887cab9f635d9

6 years agoMerge "Use custom drawable for Battery saver condition icon." into pi-dev
Fan Zhang [Tue, 27 Mar 2018 04:25:15 +0000 (04:25 +0000)]
Merge "Use custom drawable for Battery saver condition icon." into pi-dev

6 years agoMerge "Don't show FP error canceled message" into pi-dev
Kevin Chyn [Tue, 27 Mar 2018 04:03:30 +0000 (04:03 +0000)]
Merge "Don't show FP error canceled message" into pi-dev
am: 2c6ea60711

Change-Id: I3431a6be839f354ee0dc0e982162c894323271c2

6 years agoMerge "Update Bluetooth related string" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 03:53:27 +0000 (03:53 +0000)]
Merge "Update Bluetooth related string" into pi-dev

6 years agoMerge "Don't show FP error canceled message" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 03:28:27 +0000 (03:28 +0000)]
Merge "Don't show FP error canceled message" into pi-dev

6 years agoUpdate Bluetooth related string
Jyun LuoLai [Tue, 27 Mar 2018 01:21:05 +0000 (09:21 +0800)]
Update Bluetooth related string

Bug: 73960246
Test: Manual test
Change-Id: Ied2a45648e52a78abe3dc84647694dd68874ba5f

6 years agoMerge "To update from "Data saver" to "Data Saver"" into pi-dev
Felka Chang [Tue, 27 Mar 2018 02:13:31 +0000 (02:13 +0000)]
Merge "To update from "Data saver" to "Data Saver"" into pi-dev
am: 135a7e9753

Change-Id: I95871ed90bfdc71a77569cb2f9fac9682d47d6ca

6 years agoMerge "To update from "Data saver" to "Data Saver"" into pi-dev
Felka Chang [Tue, 27 Mar 2018 02:08:21 +0000 (02:08 +0000)]
Merge "To update from "Data saver" to "Data Saver"" into pi-dev

6 years agoMerge "Add more string for device muted condition" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 00:52:06 +0000 (00:52 +0000)]
Merge "Add more string for device muted condition" into pi-dev
am: 2bc477959c

Change-Id: I0d58d639444733484818a557f2c35e4955c75beb

6 years agoUse custom drawable for Battery saver condition icon.
Fan Zhang [Mon, 26 Mar 2018 22:31:10 +0000 (15:31 -0700)]
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

6 years agoMerge "Add more string for device muted condition" into pi-dev
Fan Zhang [Mon, 26 Mar 2018 23:55:07 +0000 (23:55 +0000)]
Merge "Add more string for device muted condition" into pi-dev

6 years agoAdd more string for device muted condition
Fan Zhang [Mon, 26 Mar 2018 22:52:22 +0000 (15:52 -0700)]
Add more string for device muted condition

Bug: 76022431
Test: build
Change-Id: Ib3801b2ecd18d094e4431aeb89d711a6c9e62689

6 years agoMerge "Fix text overlap issue when flinging in ManageApplication" into pi-dev
Fan Zhang [Mon, 26 Mar 2018 22:04:24 +0000 (22:04 +0000)]
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev
am: 9f5849aaf4

Change-Id: Ief196f8d521b5727d2535086ab18a844349ddf1c

6 years agoMerge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev
Lei Yu [Mon, 26 Mar 2018 21:56:16 +0000 (21:56 +0000)]
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev
am: 6f22cec26d

Change-Id: I1e497fcc05faa582a1a5d9a9f958c1efad829a32

6 years agoMerge "Fix text overlap issue when flinging in ManageApplication" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 21:50:14 +0000 (21:50 +0000)]
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev

6 years agoMerge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev
Lei Yu [Mon, 26 Mar 2018 21:41:11 +0000 (21:41 +0000)]
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev

6 years agoAuto time should show dynamic subtext when restricted.
yuemingw [Mon, 26 Mar 2018 13:18:10 +0000 (14:18 +0100)]
Auto time should show dynamic subtext when restricted.

Auto time preference should show dynamic subtext corresponding to
the current status of auto time when it's restricted, instead of
hard code "enabled by admin", as it could either be enabled or disabled
when disallow_config_date_time is set.

Bug: 73811933
Test: manually by TestDPC
Change-Id: Ia7181e8a67ccfe72117f95133e9081375c121fe3

6 years agoDon't show FP error canceled message
Kevin Chyn [Mon, 26 Mar 2018 19:38:21 +0000 (12:38 -0700)]
Don't show FP error canceled message

Test: manual test of SUW, error message doesn't show up when
      confirm credentials is complete

Change-Id: Ie0750629dcd5bb5d84df08c75e9c83384c299073
Fixes: 76400618

6 years agoMerge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACC...
yuemingw [Mon, 26 Mar 2018 18:46:09 +0000 (18:46 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev
am: 21926abed2

Change-Id: Ie4130e88a3355bb91a63578bd889147da3dba726

6 years agoMerge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACC...
TreeHugger Robot [Mon, 26 Mar 2018 18:34:31 +0000 (18:34 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev

6 years agoFix text overlap issue when flinging in ManageApplication
Fan Zhang [Sat, 24 Mar 2018 00:03:38 +0000 (17:03 -0700)]
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

6 years agoUse FIELD_ANOMALY_TYPE for anomalyType
Lei Yu [Mon, 26 Mar 2018 18:26:43 +0000 (11:26 -0700)]
Use FIELD_ANOMALY_TYPE for anomalyType

Change-Id: I36d5d806f45df4153cdba3e398fa72ab89e5e082
Fixes: 76424026
Test: RunSettingsRoboTests

6 years agoMerge "Block simple numeric passwords in ChooseLockPassword" into pi-dev
Rubin Xu [Mon, 26 Mar 2018 18:19:05 +0000 (18:19 +0000)]
Merge "Block simple numeric passwords in ChooseLockPassword" into pi-dev
am: c3938f6f6e

Change-Id: I8599fbcfc070842d7f4755cbcda5e1dcf80f91a5

6 years agoMerge "Block simple numeric passwords in ChooseLockPassword" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 18:06:04 +0000 (18:06 +0000)]
Merge "Block simple numeric passwords in ChooseLockPassword" into pi-dev

6 years agoUpdate recently sent preferences
Julia Reynolds [Mon, 26 Mar 2018 17:41:20 +0000 (17:41 +0000)]
Update recently sent preferences
am: 5c83f14d7e

Change-Id: I71d6da7beba2beecad671e296c76a127815fe241

6 years agoRemove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS
yuemingw [Mon, 12 Mar 2018 16:38:50 +0000 (16:38 +0000)]
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

6 years agoUpdate recently sent preferences
Julia Reynolds [Wed, 21 Mar 2018 20:10:20 +0000 (16:10 -0400)]
Update recently sent preferences

Test: make -j RunSettingsRoboTests
Bug: 74318867
Fixes: 73004227
Change-Id: Icecf1d4f0e3dd38c96919874a7f614ed93a001ab

6 years agoBlock simple numeric passwords in ChooseLockPassword
Rubin Xu [Thu, 25 Jan 2018 21:12:57 +0000 (21:12 +0000)]
Block simple numeric passwords in ChooseLockPassword

Fix the previously-missing case where the user elects to set
a password (instead of PIN), but still sets a numeric password
that contains repeated sequence which should be blocked by admin
policy.

Bug: 72039850
Test: Set NUMERIC_COMPLEX password quality, then attempt to
      enroll a repeating numeric PIN as lockscreen *password*
Change-Id: I7c7525716b37a5330147b899b80026ca71c3ce0c

6 years agoObserve NetworkCallback instead of polling
Adam Newman [Tue, 20 Mar 2018 04:09:52 +0000 (21:09 -0700)]
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

6 years agoMerge "Do not allow force stopping protected packages" into pi-dev
Benjamin Franz [Mon, 26 Mar 2018 09:24:02 +0000 (09:24 +0000)]
Merge "Do not allow force stopping protected packages" into pi-dev
am: 396e91abf0

Change-Id: I725a5a666ef7155fe98d6beb4d9c5ec461af4377

6 years agoMerge "Do not allow force stopping protected packages" into pi-dev
Benjamin Franz [Mon, 26 Mar 2018 09:15:41 +0000 (09:15 +0000)]
Merge "Do not allow force stopping protected packages" into pi-dev

6 years agoFix issue "open battery settings, switch locale, apps are still in old locale" into...
WenHung_Teng [Thu, 22 Mar 2018 08:23:21 +0000 (16:23 +0800)]
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

6 years agoTo update from "Data saver" to "Data Saver"
felkachang [Thu, 22 Mar 2018 06:42:55 +0000 (14:42 +0800)]
To update from "Data saver" to "Data Saver"

To change data_saver_title res string from "Data saver" to "Data Saver".
There are 2 places to change and most of them are belong to en locale
charactors.
  res/values/strings.xml
    To change XML To "Help URL, Data saver" to "Help URL, Data Saver"
    because there is already one XML comment "Data Saver mode is on".
    To change data_saver_title to be "Data Saver" because
    condition_bg_data_title use "Data Saver".

Bug: 75983079
Test: make -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I4ef88c962d6388c38841d47e4dc9674e8a4bb793

6 years agoMerge "Add UX string tweaks before string freeze." into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 08:59:57 +0000 (08:59 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
am: d6e81ab51b

Change-Id: Id413301fb3794dbe6055ba76efbfd6099dfbde8d

6 years agoMerge "Add UX string tweaks before string freeze." into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 08:49:58 +0000 (08:49 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev

6 years agoMerge "Return back-up slices for unavailable settings" into pi-dev
Matthew Fritze [Sat, 24 Mar 2018 07:17:35 +0000 (07:17 +0000)]
Merge "Return back-up slices for unavailable settings" into pi-dev
am: 362ba01789

Change-Id: Ic4dbd881bbe0bc5044b148a4c57736a1a0dc9fac

6 years agoMerge "Return back-up slices for unavailable settings" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 07:04:47 +0000 (07:04 +0000)]
Merge "Return back-up slices for unavailable settings" into pi-dev

6 years agoMerge "Separate skip and clear button in pattern screen" into pi-dev
Maurice Lam [Sat, 24 Mar 2018 05:55:25 +0000 (05:55 +0000)]
Merge "Separate skip and clear button in pattern screen" into pi-dev
am: 59b25d0043

Change-Id: Ibd042c0e3686e899e22a144295829309bc623fa4

6 years agoMerge "Separate skip and clear button in pattern screen" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:46:35 +0000 (05:46 +0000)]
Merge "Separate skip and clear button in pattern screen" into pi-dev

6 years agoMerge "Add toggle title for Data Saver" into pi-dev
Doris Ling [Sat, 24 Mar 2018 05:36:14 +0000 (05:36 +0000)]
Merge "Add toggle title for Data Saver" into pi-dev
am: c812ec6c89

Change-Id: Idc9711ebf92a19337e79a01665c8a46330634fda

6 years agoMerge "Add callback when tethering fails" into pi-dev
Lei Yu [Sat, 24 Mar 2018 05:33:56 +0000 (05:33 +0000)]
Merge "Add callback when tethering fails" into pi-dev
am: 1682085feb

Change-Id: I453702ec5cba4ea5d65d3287acc75d2adc4890e4

6 years agoMerge "Add toggle title for Data Saver" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:30:28 +0000 (05:30 +0000)]
Merge "Add toggle title for Data Saver" into pi-dev

6 years agoMerge ""My Phone" -> "About Phone"" into pi-dev
Fan Zhang [Sat, 24 Mar 2018 05:24:32 +0000 (05:24 +0000)]
Merge ""My Phone" -> "About Phone"" into pi-dev
am: 6ab6ed4e7a

Change-Id: I892a6697735121389b4f8797bfadfde4f5b93602

6 years agoMerge "Add callback when tethering fails" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:24:09 +0000 (05:24 +0000)]
Merge "Add callback when tethering fails" into pi-dev

6 years agoMerge "Add preference controller to launch app-time-spent UI." into pi-dev
Fan Zhang [Sat, 24 Mar 2018 05:23:53 +0000 (05:23 +0000)]
Merge "Add preference controller to launch app-time-spent UI." into pi-dev
am: 30da391fa0

Change-Id: Id6ac2c1980a2fb9ab995168a204295b08cf8e2d8

6 years agoMerge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev
Sean Callanan [Sat, 24 Mar 2018 05:23:17 +0000 (05:23 +0000)]
Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev
am: 8d8ee565b1

Change-Id: I147f0648d976094b291b49c2649d8529930436be

6 years agoMerge "Add string for app info summary" into pi-dev
Beverly [Sat, 24 Mar 2018 05:22:40 +0000 (05:22 +0000)]
Merge "Add string for app info summary" into pi-dev
am: 2e32d30298

Change-Id: I96ddc68b7262503a71dc4faf56aef30021e63c87

6 years agoMerge ""My Phone" -> "About Phone"" into pi-dev
Fan Zhang [Sat, 24 Mar 2018 05:16:01 +0000 (05:16 +0000)]
Merge ""My Phone" -> "About Phone"" into pi-dev

6 years agoMerge "Update title text for finterprint suggestion." into pi-dev
Doris Ling [Sat, 24 Mar 2018 05:15:50 +0000 (05:15 +0000)]
Merge "Update title text for finterprint suggestion." into pi-dev
am: 7bf63eb62a

Change-Id: I566d7bfbcef79ad3231b74dbfb72976459fd5563

6 years agoMerge "Add preference controller to launch app-time-spent UI." into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:14:32 +0000 (05:14 +0000)]
Merge "Add preference controller to launch app-time-spent UI." into pi-dev

6 years agoMerge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:14:29 +0000 (05:14 +0000)]
Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev

6 years agoMerge "Add string for app info summary" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:14:24 +0000 (05:14 +0000)]
Merge "Add string for app info summary" into pi-dev

6 years agoMerge "Update title text for finterprint suggestion." into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 04:58:29 +0000 (04:58 +0000)]
Merge "Update title text for finterprint suggestion." into pi-dev

6 years agoMerge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev
Stanley Tng [Sat, 24 Mar 2018 04:23:02 +0000 (04:23 +0000)]
Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev
am: 53332b6dcf

Change-Id: Id736294962a1aa79e1e93647abca38bc4a9c575a

6 years agoMerge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev
Stanley Tng [Sat, 24 Mar 2018 04:09:04 +0000 (04:09 +0000)]
Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev

6 years agoMerge "Add string to warn users about device name." into pi-dev
Daniel Nishi [Sat, 24 Mar 2018 02:23:24 +0000 (02:23 +0000)]
Merge "Add string to warn users about device name." into pi-dev
am: 0d221f7767

Change-Id: I4863d112cedaecf0f14c3355c0b350ba03eb297e

6 years agoMerge "Add string to warn users about device name." into pi-dev
Daniel Nishi [Sat, 24 Mar 2018 01:04:21 +0000 (01:04 +0000)]
Merge "Add string to warn users about device name." into pi-dev

6 years agoMerge "Updates the policy transparency dialog string" into pi-dev
Tony Mak [Sat, 24 Mar 2018 00:55:35 +0000 (00:55 +0000)]
Merge "Updates the policy transparency dialog string" into pi-dev
am: 95e22fa7bd

Change-Id: I87885dd2ff53204017e547769c8d5641609fbf5a

6 years agoMerge "Updates the policy transparency dialog string" into pi-dev
Tony Mak [Sat, 24 Mar 2018 00:35:02 +0000 (00:35 +0000)]
Merge "Updates the policy transparency dialog string" into pi-dev

6 years agoAdd new strings for Hearing Aid profile in Accessibility app
Stanley Tng [Fri, 23 Mar 2018 23:59:50 +0000 (16:59 -0700)]
Add new strings for Hearing Aid profile in Accessibility app

These new strings will be used by the Accessibility Settings App for the
hearing aid profile.

Test: compiled.
Bug: 74204427
Change-Id: I41cd5c2152a8b8dacb3dd4e5f974d1427d4a7ba4

6 years agoAdd UX string tweaks before string freeze.
Jeff Sharkey [Wed, 21 Mar 2018 17:14:56 +0000 (11:14 -0600)]
Add UX string tweaks before string freeze.

We're fully intending to implement some string and layout tweaks
requested by UX, but we need to get the requested strings checked
in before the strings deadline.  We carefully keep existing (legacy)
strings intact to avoid any runtime crashes until we get the layout
work done.

Test: builds, boots
Bug: 76097999
Change-Id: Ic6531de170df8eaa8b3a0a23d76a0c8821bb5b16

6 years agoMerge "New strings for time zone picker" into pi-dev
Victor Chang [Fri, 23 Mar 2018 23:24:18 +0000 (23:24 +0000)]
Merge "New strings for time zone picker" into pi-dev
am: 6c737f9790

Change-Id: I52ff1e792c10da219060eddf8ff7f3db42620113

6 years agoMerge "Add new strings for auto-wifi" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 22:30:36 +0000 (22:30 +0000)]
Merge "Add new strings for auto-wifi" into pi-dev
am: 553c2778af

Change-Id: Ie344d56a288aaf643b507d25496ea4c3f85a32d5

6 years agoMerge "Add extra strings for hidden network option" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 22:26:39 +0000 (22:26 +0000)]
Merge "Add extra strings for hidden network option" into pi-dev
am: 8bbb4082bb

Change-Id: Id1b4364c37c7bb482312b442ee6f517005cac96b

6 years agoMerge "New strings for time zone picker" into pi-dev
Victor Chang [Fri, 23 Mar 2018 22:23:23 +0000 (22:23 +0000)]
Merge "New strings for time zone picker" into pi-dev

6 years agoMerge "Add strings for mobile hotspot bands" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 22:16:13 +0000 (22:16 +0000)]
Merge "Add strings for mobile hotspot bands" into pi-dev
am: 5cfebe55ea

Change-Id: I6b6ef32dc0d93002c5e1c04049d638e42c1e22ab

6 years agoMerge "[QS] Add Settings intent filters for Data Usage" into pi-dev
Rohan Shah [Fri, 23 Mar 2018 22:04:44 +0000 (22:04 +0000)]
Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev
am: 1ff54d7e05

Change-Id: I63d45796dcebb66db56d795054443b75a771c0df

6 years agoAdd preference controller to launch app-time-spent UI.
Fan Zhang [Fri, 23 Mar 2018 20:02:24 +0000 (13:02 -0700)]
Add preference controller to launch app-time-spent UI.

Bug: 74580195
Test: robotests
Change-Id: Iba9338f04cc037a134ef9445ce97cbbe21f53833

6 years ago"My Phone" -> "About Phone"
Daniel Nishi [Fri, 23 Mar 2018 20:43:12 +0000 (13:43 -0700)]
"My Phone" -> "About Phone"

String polishing fix.

Bug: 36458278
Test: Manual
Change-Id: If0d90aa252d0ffe8bdbb8d255d1bec736ba2017a

6 years agoMerge "Add string needed by app usage tracking feature." into pi-dev
Fan Zhang [Fri, 23 Mar 2018 20:58:53 +0000 (20:58 +0000)]
Merge "Add string needed by app usage tracking feature." into pi-dev
am: 80bf63a2dd

Change-Id: Iecd8186a7ab00da30f76ec7fb7f4ea05a197b72f

6 years agoMerge "Add keywords for search terms" into pi-dev
Matthew Fritze [Fri, 23 Mar 2018 20:55:16 +0000 (20:55 +0000)]
Merge "Add keywords for search terms" into pi-dev
am: dd0e23b987

Change-Id: I799ea57dd55845562585deb1bd1d2856af671d7e

6 years agoMerge "Add strings for night display UX changes" into pi-dev
Christine Franks [Fri, 23 Mar 2018 20:45:36 +0000 (20:45 +0000)]
Merge "Add strings for night display UX changes" into pi-dev
am: 0aa142ff18

Change-Id: Ib18f40bad556370bb3e56b223446754a9de8863c

6 years agoAdd string for app info summary
Beverly [Fri, 23 Mar 2018 20:33:37 +0000 (16:33 -0400)]
Add string for app info summary

Test: n/a
Bug: 72442731
Change-Id: Ibdf83450159334647ba26b2c44ee6cc5b21638d7

6 years agoMerge "Update battery saver condition text." into pi-dev
Doris Ling [Fri, 23 Mar 2018 20:37:55 +0000 (20:37 +0000)]
Merge "Update battery saver condition text." into pi-dev
am: 96a85d6aca

Change-Id: Ia5e121af00fa07aae39f89b70a5a1dc36bb171d4

6 years agoMerge "Add new string for updating auto-wifi" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 20:33:19 +0000 (20:33 +0000)]
Merge "Add new string for updating auto-wifi" into pi-dev
am: e9b0ba9bac

Change-Id: Ieeefa5bc8a8ad96f80905b8838d2d0357627e1ef

6 years agoMerge "Add new strings for auto-wifi" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 20:33:07 +0000 (20:33 +0000)]
Merge "Add new strings for auto-wifi" into pi-dev

6 years agoMerge "Add extra strings for hidden network option" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 20:32:16 +0000 (20:32 +0000)]
Merge "Add extra strings for hidden network option" into pi-dev

6 years agoMerge "Rename "Primary data" to "Current data"." into pi-dev
Jan Nordqvist [Fri, 23 Mar 2018 20:12:03 +0000 (20:12 +0000)]
Merge "Rename "Primary data" to "Current data"." into pi-dev
am: 7884751938

Change-Id: Ieac649b12d0df53a1102a619afd59be6463d7adc

6 years agoMerge "Add strings for mobile hotspot bands" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 20:10:49 +0000 (20:10 +0000)]
Merge "Add strings for mobile hotspot bands" into pi-dev

6 years ago[Settings] Add strings for Natural and Automatic color modes
Sean Callanan [Thu, 22 Mar 2018 02:28:37 +0000 (19:28 -0700)]
[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 e8f9bf5f68853fc8bc5c828e7d5636e6851ec45a)

6 years agoAdd string to warn users about device name.
Daniel Nishi [Thu, 22 Mar 2018 21:06:53 +0000 (14:06 -0700)]
Add string to warn users about device name.

Device name is exposed to apps and through Bluetooth name and Wi-Fi
hotspot name. This warning tells users that before they set it.

Bug: 74981919
Test: Builds -- string currently unused.
Change-Id: I0b4bb49bcff6485a79688d98ca9bab1ce9948efd

6 years agoMerge "[QS] Add Settings intent filters for Data Usage" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 19:51:16 +0000 (19:51 +0000)]
Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev

6 years agoReturn back-up slices for unavailable settings
Matthew Fritze [Wed, 28 Feb 2018 18:31:06 +0000 (10:31 -0800)]
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

6 years agoNew strings for time zone picker
Victor Chang [Fri, 23 Mar 2018 19:24:41 +0000 (19:24 +0000)]
New strings for time zone picker

Bug: 75322108
Test: m SettingsGoogle
Change-Id: I04662384bf1487066b1dc91944b6f1d2115d509a

6 years agoUpdate title text for finterprint suggestion.
Doris Ling [Fri, 23 Mar 2018 19:24:58 +0000 (12:24 -0700)]
Update title text for finterprint suggestion.

Bug: 76098479
Test: rebuild
Change-Id: Id09a8019844ca5f6c528f4bd1b37117380e663b8

6 years agoMerge "Add string needed by app usage tracking feature." into pi-dev
Fan Zhang [Fri, 23 Mar 2018 19:19:13 +0000 (19:19 +0000)]
Merge "Add string needed by app usage tracking feature." into pi-dev

6 years agoUpdates the policy transparency dialog string
Tony Mak [Fri, 23 Mar 2018 17:09:19 +0000 (17:09 +0000)]
Updates the policy transparency dialog string

Test: Build and observe the string.

Fixes: 68973125

Change-Id: Ic1461f8b7157cfcc50d6f4766fced725307b9cc0

6 years agoMerge "Hide password for wifi tether" into pi-dev
Lei Yu [Fri, 23 Mar 2018 18:51:42 +0000 (18:51 +0000)]
Merge "Hide password for wifi tether" into pi-dev
am: 9bb2efa0ff

Change-Id: I7f82bf71672b6e966bf699ca17a215547c0dc8d9

6 years agoMerge changes I034a9f0a,Iad5ec577 into pi-dev
Fan Zhang [Fri, 23 Mar 2018 18:46:08 +0000 (18:46 +0000)]
Merge changes I034a9f0a,Iad5ec577 into pi-dev
am: dd5977901d

Change-Id: If135a04e461c80dafe0994010d6d1b36324a8f9a

6 years agoMerge "Show time zone used in or after 2018 only" into pi-dev
Neil Fuller [Fri, 23 Mar 2018 18:40:32 +0000 (18:40 +0000)]
Merge "Show time zone used in or after 2018 only" into pi-dev
am: cbaa984cde

Change-Id: Ibfeab2c86368c80315b6be18701e70deeac5069f

6 years agoMerge "Add keywords for search terms" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 18:35:23 +0000 (18:35 +0000)]
Merge "Add keywords for search terms" into pi-dev

6 years agoMerge "Add string for forget confirmation dialog" into pi-dev
hylo [Fri, 23 Mar 2018 18:33:28 +0000 (18:33 +0000)]
Merge "Add string for forget confirmation dialog" into pi-dev
am: 4b8715afa8

Change-Id: I5d7217a63c5cd3585b38f15de892f00aa7beb6ed

6 years agoMerge "Add strings for night display UX changes" into pi-dev
Christine Franks [Fri, 23 Mar 2018 18:33:06 +0000 (18:33 +0000)]
Merge "Add strings for night display UX changes" into pi-dev