OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Add string linter preupload check" into pi-dev am: 49d0205749
Fan Zhang [Tue, 27 Mar 2018 16:18:38 +0000 (16:18 +0000)]
Merge "Add string linter preupload check" into pi-dev am: 49d0205749
am: cb3b32c9c4

Change-Id: I10351f1a71173ccc1e65de12ffbfdbf78c836af9

6 years agoMerge "Add string linter preupload check" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 16:10:50 +0000 (16:10 +0000)]
Merge "Add string linter preupload check" into pi-dev
am: 49d0205749

Change-Id: Icaf820d0d6e4f6b9f56283e93752310355e15b89

6 years agoMerge "Add string linter preupload check" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 16:01:24 +0000 (16:01 +0000)]
Merge "Add string linter preupload check" into pi-dev

6 years agoMerge "Show wifi status label in preference summary." into pi-dev am: d467a8bc0f
Amin Shaikh [Tue, 27 Mar 2018 13:49:09 +0000 (13:49 +0000)]
Merge "Show wifi status label in preference summary." into pi-dev am: d467a8bc0f
am: 2f6979c9fe

Change-Id: I577ffa4b4e699a9163a5ca190fcfe08f167dc2f5

6 years agoMerge "Add title to What to block page" into pi-dev am: 517f6d602d
HJ ChangLiao [Tue, 27 Mar 2018 13:32:12 +0000 (13:32 +0000)]
Merge "Add title to What to block page" into pi-dev am: 517f6d602d
am: ac4d617706

Change-Id: I4b1d206842370e08e73f32e00404109a55463561

6 years agoMerge "Show wifi status label in preference summary." into pi-dev
Amin Shaikh [Tue, 27 Mar 2018 13:24:24 +0000 (13:24 +0000)]
Merge "Show wifi status label in preference summary." into pi-dev
am: d467a8bc0f

Change-Id: Icae963b4831b916e615a9e729116135967c5a388

6 years agoMerge "Add title to What to block page" into pi-dev
HJ ChangLiao [Tue, 27 Mar 2018 13:18:51 +0000 (13:18 +0000)]
Merge "Add title to What to block page" into pi-dev
am: 517f6d602d

Change-Id: I3e898bf29199164d279f611973459fd67b7f347c

6 years agoMerge "Show wifi status label in preference summary." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 13:10:24 +0000 (13:10 +0000)]
Merge "Show wifi status label in preference summary." into pi-dev

6 years agoMerge "Add title to What to block page" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 13:04:03 +0000 (13:04 +0000)]
Merge "Add title to What to block page" into pi-dev

6 years agoFix crash in time zone picker due to race condition on view updates am: 201c629fcc
Victor Chang [Tue, 27 Mar 2018 09:53:53 +0000 (09:53 +0000)]
Fix crash in time zone picker due to race condition on view updates am: 201c629fcc
am: 93e464564f

Change-Id: I909d13c92601b63dccd782af2c0962e81507cc0f

6 years agoAdd title to What to block page
HJ ChangLiao [Tue, 27 Mar 2018 09:47:07 +0000 (17:47 +0800)]
Add title to What to block page

Add title to page Sound> Do Not Disturb> What to block
Fixes: 76103812
Test: make RunSettingsRoboTests -j

Change-Id: Iee2679cb94e1447769402d27895b276b8853d97a

6 years agoFix crash in time zone picker due to race condition on view updates
Victor Chang [Tue, 27 Mar 2018 09:42:04 +0000 (09:42 +0000)]
Fix crash in time zone picker due to race condition on view updates
am: 201c629fcc

Change-Id: Icd55bf16959da9e67b75ec93c53ef21fdcb9014f

6 years agoFix crash in time zone picker due to race condition on view updates
Victor Chang [Sat, 24 Mar 2018 18:07:50 +0000 (18:07 +0000)]
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

6 years agoMerge "Auto time should show dynamic subtext when restricted." into pi-dev am: d7ea524e81
yuemingw [Tue, 27 Mar 2018 08:44:30 +0000 (08:44 +0000)]
Merge "Auto time should show dynamic subtext when restricted." into pi-dev am: d7ea524e81
am: 8c3bccda2c

Change-Id: Ifc207a8adb1ab1e976d540366c3d1ef29588ebfa

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:33:29 +0000 (06:33 +0000)]
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

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 am: d2fb46eac4
Adam Newman [Tue, 27 Mar 2018 06:01:17 +0000 (06:01 +0000)]
Merge "Observe NetworkCallback instead of polling" into pi-dev am: d2fb46eac4
am: 211535a10d

Change-Id: I440c17b8cf5670e40706f07832737927930de986

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 am: 74ac3b1f3a
Fan Zhang [Tue, 27 Mar 2018 05:20:19 +0000 (05:20 +0000)]
Merge "Use custom drawable for Battery saver condition icon." into pi-dev am: 74ac3b1f3a
am: b4c4d47e2e

Change-Id: Ib7d4ea27dae28192ce4e1a53324b9062a2e6948b

6 years agoMerge "Update Bluetooth related string" into pi-dev am: 198a6495ad
Jyun LuoLai [Tue, 27 Mar 2018 05:03:15 +0000 (05:03 +0000)]
Merge "Update Bluetooth related string" into pi-dev am: 198a6495ad
am: 1c502210e3

Change-Id: Id6cdd7982d73835baec447076a49e184979e099d

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

Change-Id: I9fa98d943cafa514b4205a39feeeb07fd9dcbfcb

6 years agoAdd string linter preupload check
Fan Zhang [Tue, 27 Mar 2018 04:34:07 +0000 (21:34 -0700)]
Add string linter preupload check

Bug: 76097999
Test: repo upload
Change-Id: Ieb31c931d73a4325f605963b374ca7a2d568e08c

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 am: 135a7e9753
Felka Chang [Tue, 27 Mar 2018 02:29:49 +0000 (02:29 +0000)]
Merge "To update from "Data saver" to "Data Saver"" into pi-dev am: 135a7e9753
am: 5021c0c22d

Change-Id: Ie32dec259c8053d7745e052b81d69f686fe28606

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 am: 2bc477959c
Fan Zhang [Tue, 27 Mar 2018 01:10:50 +0000 (01:10 +0000)]
Merge "Add more string for device muted condition" into pi-dev am: 2bc477959c
am: 3ca50d70ac

Change-Id: I884441946a5b64ea66e7cb9e0b8bf9463b80916a

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 am...
Fan Zhang [Mon, 26 Mar 2018 22:17:03 +0000 (22:17 +0000)]
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev am: 9f5849aaf4
am: a89fb2e6dd

Change-Id: I58c96bdace9c5a5cd2ff8d8e61c53e4f5f962495

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 am: 6f22cec26d
Lei Yu [Mon, 26 Mar 2018 22:03:30 +0000 (22:03 +0000)]
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev am: 6f22cec26d
am: 13a40e76eb

Change-Id: Id996b022ac0c98226698469d5afc4b6aab4ba9cb

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:51:49 +0000 (18:51 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev am: 21926abed2
am: a3db549834

Change-Id: If7c967d8bf7eddf3a50bd3d629e3e79c85fac5e6

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 agoShow wifi status label in preference summary.
Amin Shaikh [Wed, 21 Mar 2018 19:08:54 +0000 (15:08 -0400)]
Show wifi status label in preference summary.

Bug: 74075761
Test: m RunSettingsRoboTests && manual
Change-Id: I286fac5d9390634facc0f04b845ef668c55d1331

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 am: c3938f6f6e
Rubin Xu [Mon, 26 Mar 2018 18:24:20 +0000 (18:24 +0000)]
Merge "Block simple numeric passwords in ChooseLockPassword" into pi-dev am: c3938f6f6e
am: d80739b276

Change-Id: I73ae8b22e3b1baec1ecca97a68210113fe08d758

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 am: 5c83f14d7e
Julia Reynolds [Mon, 26 Mar 2018 17:50:47 +0000 (17:50 +0000)]
Update recently sent preferences am: 5c83f14d7e
am: 6a942f930b

Change-Id: I4088f66e3c798a30043ccb6e48685f3fa5f7700d

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 am: 396e91abf0
Benjamin Franz [Mon, 26 Mar 2018 09:42:31 +0000 (09:42 +0000)]
Merge "Do not allow force stopping protected packages" into pi-dev am: 396e91abf0
am: c81072f6ab

Change-Id: I03da3f59434e58936afb6646d393393a8899965e

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 am: d6e81ab51b
Jeff Sharkey [Sun, 25 Mar 2018 09:06:30 +0000 (09:06 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev am: d6e81ab51b
am: 029834a93e

Change-Id: I3c1fe048e4ba9a9098e1c9dfdd3831dcf28c10eb

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 am: 362ba01789
Matthew Fritze [Sat, 24 Mar 2018 07:59:35 +0000 (07:59 +0000)]
Merge "Return back-up slices for unavailable settings" into pi-dev am: 362ba01789
am: 2cc4516030

Change-Id: Iaf5c385ebae91340294b027ee6037bb0589fa607

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

Change-Id: Ia8aeb392ce080533c503d3cf4e9b6e9370425e87

6 years agoMerge "Add toggle title for Data Saver" into pi-dev am: c812ec6c89
Doris Ling [Sat, 24 Mar 2018 07:57:22 +0000 (07:57 +0000)]
Merge "Add toggle title for Data Saver" into pi-dev am: c812ec6c89
am: 4d3390d619

Change-Id: I58b7c65faa67e70a261b5ceebfd787d3159c9cbd

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

Change-Id: Ie1e512ffa61b138769b25bf0c54bc459940f91fc

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

Change-Id: I3d8c617eec7fc1cf739094d834eede3af785e42a

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

Change-Id: Ic19a6b808359f45a8c51d06de04d635d1ea10ceb

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

Change-Id: Ie9efef5b5a8abe1a16048a129ad770048342438c

6 years agoMerge "Add string for app info summary" into pi-dev am: 2e32d30298
Beverly [Sat, 24 Mar 2018 07:50:56 +0000 (07:50 +0000)]
Merge "Add string for app info summary" into pi-dev am: 2e32d30298
am: 714c5fad50

Change-Id: If7cd1cd90e7cb7ec50e5b4bbf627e0624b011b5c

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

Change-Id: I0ae5e6ec09c21914f384d9cf66c23538b3a17777

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

Change-Id: I8ef143a25ed8cb9d90dfd961f97b0e6ebcdd6c06

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