OSDN Git Service

android-x86/packages-apps-Settings.git
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 agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 16 Mar 2018 23:59:16 +0000 (23:59 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: 77d1ca7030  -s ours

Change-Id: I28549cd7cc5ee5a38037a63a10c5351e899589a6

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 23:19:48 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Update USB settings screen" into pi-dev
Jerry Zhang [Fri, 16 Mar 2018 23:12:29 +0000 (23:12 +0000)]
Merge "Update USB settings screen" into pi-dev
am: d85ef28585

Change-Id: I2eeb0b2e585fd958be20f5831bee4257b1838c92

6 years agoMerge "Update USB settings screen" into pi-dev
Jerry Zhang [Fri, 16 Mar 2018 22:40:38 +0000 (22:40 +0000)]
Merge "Update USB settings screen" into pi-dev

6 years agoMerge "Update the wifi off string" into pi-dev
Lei Yu [Fri, 16 Mar 2018 21:47:03 +0000 (21:47 +0000)]
Merge "Update the wifi off string" into pi-dev
am: ef0278ae3c

Change-Id: I5e01bef3499120ad709834cff1afa4f4dc956dc6

6 years agoMerge "Update the wifi off string" into pi-dev
Lei Yu [Fri, 16 Mar 2018 21:28:43 +0000 (21:28 +0000)]
Merge "Update the wifi off string" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 16 Mar 2018 20:20:09 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If94e8adc7ea1d0106ebb553314d47f4311ffbd0e

6 years agoMerge "Link to dnd settings from notification settings" into pi-dev
Julia Reynolds [Fri, 16 Mar 2018 20:00:44 +0000 (20:00 +0000)]
Merge "Link to dnd settings from notification settings" into pi-dev
am: 5d419a2dcf

Change-Id: I9c70fdc2b327e095a75edc0bd6720e671e8f1436

6 years agoMerge "Link to dnd settings from notification settings" into pi-dev
Julia Reynolds [Fri, 16 Mar 2018 19:43:38 +0000 (19:43 +0000)]
Merge "Link to dnd settings from notification settings" into pi-dev

6 years agoMerge "update strings in battery settings(Round 1)" into pi-dev
Lei Yu [Fri, 16 Mar 2018 18:53:53 +0000 (18:53 +0000)]
Merge "update strings in battery settings(Round 1)" into pi-dev
am: cf0cae785f

Change-Id: I5a31629dadc6a6119327dc3ba87890670788ce2f

6 years agoMerge "update strings in battery settings(Round 1)" into pi-dev
Lei Yu [Fri, 16 Mar 2018 18:26:49 +0000 (18:26 +0000)]
Merge "update strings in battery settings(Round 1)" into pi-dev

6 years agoMerge "In Data Usage screen, Above the data bar, Change font size of number." into...
Jan Nordqvist [Fri, 16 Mar 2018 17:38:23 +0000 (17:38 +0000)]
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
am: 6b65ffaab7

Change-Id: Ia31548ee407a5a32033f5967d948bd34e5e63049

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

6 years agoLink to dnd settings from notification settings
Julia Reynolds [Thu, 15 Mar 2018 14:22:01 +0000 (10:22 -0400)]
Link to dnd settings from notification settings

Test: make -j20 RunSettingsRoboTests
Change-Id: Idf70155134b2e78bd410468497cabe8faf1557ce
Fixes: 74319354

6 years agoMerge "Fix channel screen launching" into pi-dev
Julia Reynolds [Fri, 16 Mar 2018 16:18:23 +0000 (16:18 +0000)]
Merge "Fix channel screen launching" into pi-dev
am: a0cb928098

Change-Id: I752695e576eae29650c3d79841b509fb267429b6

6 years agoIn Data Usage screen, Above the data bar, Change font size of number.
Jan Nordqvist [Thu, 15 Mar 2018 22:47:58 +0000 (15:47 -0700)]
In Data Usage screen, Above the data bar, Change font size of number.

Bug: 70950124

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

6 years agoMerge "Sort Uncategorized channel to the bottom." into pi-dev
Alison Cichowlas [Fri, 16 Mar 2018 16:02:23 +0000 (16:02 +0000)]
Merge "Sort Uncategorized channel to the bottom." into pi-dev
am: 97f63ba910

Change-Id: I4e272ef729124c926a2de3510985556e5375bfa5

6 years agoMerge "Fix channel screen launching" into pi-dev
Julia Reynolds [Fri, 16 Mar 2018 15:45:05 +0000 (15:45 +0000)]
Merge "Fix channel screen launching" into pi-dev

6 years agoMerge "Sort Uncategorized channel to the bottom." into pi-dev
Alison Cichowlas [Fri, 16 Mar 2018 15:44:12 +0000 (15:44 +0000)]
Merge "Sort Uncategorized channel to the bottom." into pi-dev

6 years agoMerge "Enable launching captive portal directly" into pi-dev
Adam Newman [Fri, 16 Mar 2018 14:42:19 +0000 (14:42 +0000)]
Merge "Enable launching captive portal directly" into pi-dev
am: 2483a40841

Change-Id: I6ee69efe346eff3c391dc9251b9881b23d85042b

6 years agoMerge "Enable launching captive portal directly" into pi-dev
Adam Newman [Fri, 16 Mar 2018 14:26:25 +0000 (14:26 +0000)]
Merge "Enable launching captive portal directly" into pi-dev

6 years agoRestore "Update for 1.0.0-beta1"
Alan Viverette [Fri, 16 Mar 2018 14:06:33 +0000 (14:06 +0000)]
Restore "Update for 1.0.0-beta1"
am: 4734b3448a

Change-Id: I18ef49f6ed15a3e01b8fda0ab4954f356982facd

6 years agoRestore "Update for 1.0.0-beta1"
Alan Viverette [Thu, 15 Mar 2018 21:19:52 +0000 (21:19 +0000)]
Restore "Update for 1.0.0-beta1"

This reverts commit b4fe52343c7df00cd4801c2d712a377d473b2a17.

Bug: 74950017
Test: manual
Change-Id: I9749b9ae8f2f75b1bbdf7c6686a036db1f6f8a74

6 years agoupdate strings in battery settings(Round 1)
Lei Yu [Tue, 13 Mar 2018 21:19:04 +0000 (14:19 -0700)]
update strings in battery settings(Round 1)

This cl updates the strings in several battery
settings pages and dialogs, also add footers
for battery manager page and restrict app page.

Update the strings in battery settings except:
1. Summary for smart battery toggle
2. "Full charge lasts"
3. Restrict dialog
4. App info page

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I4955cc7c19b5f1df18f21cfb47e8859c997e19d1

6 years agoUpdate USB settings screen
Jerry Zhang [Fri, 23 Feb 2018 02:13:06 +0000 (18:13 -0800)]
Update USB settings screen

Screen now handles data role and power
role switching as separate categories.

Change the UsbBackend api to use predefined
constants. Split out data and power direction
changes into separate functions.

Add tests for new controllers and new backend
functionality.

Bug: 72829348
Test: passes
Change-Id: I28b96cf49463fa4f3a4b6be41c57d5841731fbd6

6 years agoSort Uncategorized channel to the bottom.
Alison Cichowlas [Thu, 15 Mar 2018 22:07:27 +0000 (18:07 -0400)]
Sort Uncategorized channel to the bottom.

Bug: 64803214
Test: manual, with Duo app
Change-Id: I8e39fbed4ecda2efebb4606f38ea934647317207

6 years agoEnable launching captive portal directly
Adam Newman [Fri, 9 Mar 2018 00:59:34 +0000 (16:59 -0800)]
Enable launching captive portal directly

Whenever a user has connected to a captive portal network, split the
ConnectedAccessPointPreference to allow directly signing into the
captive portal or modifying the network's settings. When in any other
network state, use the old behavior of a single tappable preference that
takes the user to settings.

Bug: 63929546
Bug: 68031656
Test: make RunSettingsRoboTests
Test: manual by connecting to Captive Portal and normal WiFi networks.

Change-Id: I444202a12138d90c94bda94945c121c8c0810536
(cherry picked from commit 7577624db7bf9d9c8382161bab25849589822601)

6 years agoMerge "Revert "Update for 1.0.0-beta1"" into pi-dev
Alan Viverette [Thu, 15 Mar 2018 20:38:29 +0000 (20:38 +0000)]
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev
am: 767743d64d

Change-Id: Ifd2438bfa6947bd98eb4d0a843a689d7790cc6ed

6 years agoMerge "Revert "Update for 1.0.0-beta1"" into pi-dev
Alan Viverette [Thu, 15 Mar 2018 20:04:22 +0000 (20:04 +0000)]
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev

6 years agoMerge "Update strings for location" into pi-dev
Lei Yu [Thu, 15 Mar 2018 18:53:37 +0000 (18:53 +0000)]
Merge "Update strings for location" into pi-dev
am: 4aff464a39

Change-Id: Id638dfc191818a64f669d197395801fb0794aabd

6 years agoRevert "Update for 1.0.0-beta1"
Alan Viverette [Thu, 15 Mar 2018 17:48:04 +0000 (17:48 +0000)]
Revert "Update for 1.0.0-beta1"

This reverts commit 6b1fd5cfa9e6ff2a1b7cdc5190ec844dacec7a72.

Reason for revert: broke Settings

Bug: 74950017
Test: revert only
Change-Id: If56a4dcac4671d8e2c5f2c0de30d13e3cf58666a

6 years agoMerge "Update the restrict app list" into pi-dev
Lei Yu [Thu, 15 Mar 2018 18:39:37 +0000 (18:39 +0000)]
Merge "Update the restrict app list" into pi-dev
am: 992444b726

Change-Id: Iefa2af2ed0ede08e484c3ecd02b221d4e8c0c5c3

6 years agoMerge "Track changes in libcore" into pi-dev
Neil Fuller [Thu, 15 Mar 2018 18:36:50 +0000 (18:36 +0000)]
Merge "Track changes in libcore" into pi-dev
am: ea2ef1af44

Change-Id: I9e743ab65f9accccb848b2df99c58f6b636ad604

6 years agoMerge "Add dialog when restrict apps are more than 5" into pi-dev
Lei Yu [Thu, 15 Mar 2018 18:33:42 +0000 (18:33 +0000)]
Merge "Add dialog when restrict apps are more than 5" into pi-dev
am: 34bfe74249

Change-Id: I5ba41a7343c8c274c785429322fe2b1ed4c6aa81

6 years agoMerge "Update strings for location" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 18:30:24 +0000 (18:30 +0000)]
Merge "Update strings for location" into pi-dev

6 years agoMerge "Update the restrict app list" into pi-dev
Lei Yu [Thu, 15 Mar 2018 18:28:48 +0000 (18:28 +0000)]
Merge "Update the restrict app list" into pi-dev

6 years agoMerge "Track changes in libcore" into pi-dev
Neil Fuller [Thu, 15 Mar 2018 18:26:36 +0000 (18:26 +0000)]
Merge "Track changes in libcore" into pi-dev

6 years agoMerge "Add dialog when restrict apps are more than 5" into pi-dev
Lei Yu [Thu, 15 Mar 2018 18:01:58 +0000 (18:01 +0000)]
Merge "Add dialog when restrict apps are more than 5" into pi-dev

6 years agoMerge "Change text for data warning and data limit." into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 17:18:15 +0000 (17:18 +0000)]
Merge "Change text for data warning and data limit." into pi-dev
am: b673aaadc9

Change-Id: Icf0d3cc17abe30946543af85829f9223fc89d921

6 years agoMerge "Update string in battery app info page" into pi-dev
Lei Yu [Thu, 15 Mar 2018 17:17:25 +0000 (17:17 +0000)]
Merge "Update string in battery app info page" into pi-dev
am: e5c7317f3f

Change-Id: Ib4ee8e6d0a2470e995dfd9c7d577759cb146ec58

6 years agoUpdate the wifi off string
Lei Yu [Wed, 14 Mar 2018 23:20:06 +0000 (16:20 -0700)]
Update the wifi off string

When wifi scanning is on.

Bug: 65626601
Test: Manual
Change-Id: Ib4b6ee1cc7f2cc1d8d4ab4d7500579047fd1bfd6

6 years agoMerge "Change text for data warning and data limit." into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)]
Merge "Change text for data warning and data limit." into pi-dev

6 years agoMerge "Update string in battery app info page" into pi-dev
Lei Yu [Thu, 15 Mar 2018 17:06:00 +0000 (17:06 +0000)]
Merge "Update string in battery app info page" into pi-dev

6 years agoChange text for data warning and data limit.
Jan Nordqvist [Mon, 12 Mar 2018 20:15:47 +0000 (13:15 -0700)]
Change text for data warning and data limit.

This change modifies the "data warning" text to show either nothing, only
warning, only limit, or warning and limit, based on which of the values are
set. It also remove the capitalization of the first letter of the texts.

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ifebb411b906719c6e2f343f48d825f7b6f17af53

6 years agoMerge "Donot disable Wi-Fi Calling when getting "registration error" intent." into...
Brad Ebinger [Thu, 15 Mar 2018 16:19:32 +0000 (16:19 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev
am: ab988900c4  -s ours

Change-Id: I9c9d6c5062f20d9c84a7c1ac8ff7e97b473f916e

6 years agoDonot disable Wi-Fi Calling when getting "registration error" intent.
Suresh Koleti [Thu, 15 Mar 2018 16:18:49 +0000 (16:18 +0000)]
Donot disable Wi-Fi Calling when getting "registration error" intent.
am: 87e0d43237  -s ours

Change-Id: Ic79f29b10792a680f846322bafa8b504a3325ff2

6 years agoMerge "Donot disable Wi-Fi Calling when getting "registration error" intent." into...
Brad Ebinger [Thu, 15 Mar 2018 16:04:56 +0000 (16:04 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev

6 years agoMerge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 15:54:16 +0000 (15:54 +0000)]
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
am: 437d421eaf

Change-Id: I346e1868268fa53979886cf4a9c9bb0cebf9af9a

6 years agoMerge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 15:43:17 +0000 (15:43 +0000)]
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev

* changes:
  Set color of update line to red if update is older than six hours.
  In Data Usage screen, Below the data bar, Add “X days left” field.
  In Data Usage screen, add over-limit state.
  Change text layout of data usage string.

6 years agoMerge "Update for 1.0.0-beta1" into pi-dev
Alan Viverette [Thu, 15 Mar 2018 13:59:45 +0000 (13:59 +0000)]
Merge "Update for 1.0.0-beta1" into pi-dev
am: 3618f68c01

Change-Id: I66ac7416a3aa3cccbd22ca4b2b934dcfff0a4893

6 years agoAdd placeholder on DND settings screen
Julia Reynolds [Thu, 15 Mar 2018 13:34:03 +0000 (09:34 -0400)]
Add placeholder on DND settings screen

Bug: 74321426
Test: make -j20 RunSettingsRoboTests
Change-Id: Icb7d21e342af85d1ad83e89efa2fe9a1d41e710b

6 years agoMerge "Update for 1.0.0-beta1" into pi-dev
Alan Viverette [Thu, 15 Mar 2018 13:32:16 +0000 (13:32 +0000)]
Merge "Update for 1.0.0-beta1" into pi-dev

6 years agoFix channel screen launching
Julia Reynolds [Wed, 14 Mar 2018 20:28:39 +0000 (16:28 -0400)]
Fix channel screen launching

Test: launch channel screen from Settings & external app
Change-Id: Ib9add2f25cbacde192095407b83b17438946a493
Fixes: 73814186

6 years agoSet color of update line to red if update is older than six hours.
Jan Nordqvist [Mon, 12 Mar 2018 22:19:29 +0000 (15:19 -0700)]
Set color of update line to red if update is older than six hours.

In Data Usage screen, out-of-date state

Bug: 70950124

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

6 years agoIn Data Usage screen, Below the data bar, Add “X days left” field.
Jan Nordqvist [Fri, 9 Mar 2018 23:13:46 +0000 (15:13 -0800)]
In Data Usage screen, Below the data bar, Add “X days left” field.

Bug: 70950124

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

6 years agoIn Data Usage screen, add over-limit state.
Sundeep Ghuman [Thu, 15 Mar 2018 06:00:54 +0000 (23:00 -0700)]
In Data Usage screen, add over-limit state.

Bug: 70950124
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceTest

Change-Id: Ieec0c486c6a5451cd5983f02e202ddac3413a602

6 years agoChange text layout of data usage string.
Jan Nordqvist [Wed, 7 Mar 2018 17:59:06 +0000 (09:59 -0800)]
Change text layout of data usage string.

In Data Usage screen, Above the data bar, Change font size of number
In Data Usage screen, Above the data bar, Update text style of “GB used”
In Data Usage screen, Above the data bar, Add “GB left” aligned right of bar (not always shown)

Bug: 70950124

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

6 years agoMerge "update the whitelist for anomaly detection" into pi-dev
Andrew Sapperstein [Thu, 15 Mar 2018 05:16:29 +0000 (05:16 +0000)]
Merge "update the whitelist for anomaly detection" into pi-dev
am: eb029cffaf

Change-Id: Ib30f325cd325099cf2a9909924227f99cb23b4ee

6 years agoMerge "update the whitelist for anomaly detection" into pi-dev
Andrew Sapperstein [Thu, 15 Mar 2018 05:09:59 +0000 (05:09 +0000)]
Merge "update the whitelist for anomaly detection" into pi-dev

6 years agoMerge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 05:09:41 +0000 (05:09 +0000)]
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
am: d610e51613

Change-Id: I04c04bf38ef388ddd99827407659327222aa7f44

6 years agoMerge "Rename Mobile data usage to App data usage & hide summary" into pi-dev
Andrew Sapperstein [Thu, 15 Mar 2018 05:08:47 +0000 (05:08 +0000)]
Merge "Rename Mobile data usage to App data usage & hide summary" into pi-dev
am: 0f6ff091b4

Change-Id: Ib5a548c80fb2e0c7afeb0df9e4e1c368ec9be65f

6 years agoMerge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 05:00:41 +0000 (05:00 +0000)]
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev

6 years agoMerge "Rename “Mobile data usage” to “App data usage” & hide summary" into pi-dev
Andrew Sapperstein [Thu, 15 Mar 2018 04:58:42 +0000 (04:58 +0000)]
Merge "Rename “Mobile data usage” to “App data usage” & hide summary" into pi-dev

6 years agoUpdate string in battery app info page
Lei Yu [Thu, 15 Mar 2018 00:02:30 +0000 (17:02 -0700)]
Update string in battery app info page

Change-Id: I78ce7499f10bb65d44865349738bf77300180867
Fixes: 73576591
Bugs: 73018395
Test: Manual

6 years agoFix the ProgressBar in DataUsageSummaryV2 page.
Sundeep Ghuman [Tue, 13 Mar 2018 05:25:23 +0000 (22:25 -0700)]
Fix the ProgressBar in DataUsageSummaryV2 page.

Bug: 70950124
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: I83f268c0824d9e3520899725fa572753e1de0814

6 years agoRename “Mobile data usage” to “App data usage” & hide summary
Andreas Terzis [Fri, 9 Mar 2018 06:51:47 +0000 (22:51 -0800)]
Rename “Mobile data usage” to “App data usage” & hide summary

In Data usage screen, rename “Mobile data usage” to “App data usage” &
hide summary.

Also, change the title of the new "App data usage" (old "Mobile data
usage") screen to "App data usage".

Test: manual
Test: make RunSettingsRoboTests
Bug: 70950124
Change-Id: Ide9bcb2a4b171edcd088d68275bacda1eb449afe

6 years agoMerge "Request focus in wifi screen in add network and secure wifi" into pi-dev
Yuchen Chang [Wed, 14 Mar 2018 17:54:35 +0000 (17:54 +0000)]
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev
am: 4786291624

Change-Id: I6f3596bb4cde597c9fd72804432aa272504aff0e

6 years agoAdd dialog when restrict apps are more than 5
Lei Yu [Tue, 13 Mar 2018 00:16:54 +0000 (17:16 -0700)]
Add dialog when restrict apps are more than 5

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Iec24fc1ce8e5840207610b3155dffa7059f9aa49

6 years agoTrack changes in libcore
Neil Fuller [Wed, 14 Mar 2018 17:11:44 +0000 (17:11 +0000)]
Track changes in libcore

Track method parameter changes in libcore.

Bug: 72142943
Test: Build only
Change-Id: I85396aeea98eaa8c093115ee52b52e22d1a4aa2b

6 years agoMerge "Request focus in wifi screen in add network and secure wifi" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 17:11:37 +0000 (17:11 +0000)]
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev

6 years agoMerge "Show default a11y icon in shortcut menu" into pi-dev
Phil Weaver [Wed, 14 Mar 2018 16:52:54 +0000 (16:52 +0000)]
Merge "Show default a11y icon in shortcut menu" into pi-dev
am: 920548005b

Change-Id: Ic132edde69bb1b2feb93f209cc4deab12f3a80f1

6 years agoMerge "Show default a11y icon in shortcut menu" into pi-dev
Phil Weaver [Wed, 14 Mar 2018 16:45:49 +0000 (16:45 +0000)]
Merge "Show default a11y icon in shortcut menu" into pi-dev

6 years agoMerge "Don't pre-scale vector drawables in settings" into pi-dev
Phil Weaver [Wed, 14 Mar 2018 16:25:48 +0000 (16:25 +0000)]
Merge "Don't pre-scale vector drawables in settings" into pi-dev
am: be27390af8

Change-Id: I7690249ea06347b5ecf1c58528710b426dc323c2

6 years agoMerge "Don't pre-scale vector drawables in settings" into pi-dev
Phil Weaver [Wed, 14 Mar 2018 16:03:28 +0000 (16:03 +0000)]
Merge "Don't pre-scale vector drawables in settings" into pi-dev

6 years agoRequest focus in wifi screen in add network and secure wifi
Yuchen Chang [Wed, 14 Mar 2018 09:16:05 +0000 (17:16 +0800)]
Request focus in wifi screen in add network and secure wifi

Request focus from parent view in controller. Based on framework
patch, it can be placed in a parent and focus will go to whatever view
is the default focusable in that hierarchy.

Fixes: 68776177
Fixes: 72882629
Test: RunSettingsRobotests and Manual test
Change-Id: I3bcdc4ec814f68079a00e40435f46bdfa53f4425

6 years agoMerge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi...
Ecco Park [Wed, 14 Mar 2018 07:03:09 +0000 (07:03 +0000)]
Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev
am: de08983dd2

Change-Id: I3991de744ca033132d44f7456be126b2603f11c9

6 years agoMerge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi...
TreeHugger Robot [Wed, 14 Mar 2018 06:53:12 +0000 (06:53 +0000)]
Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev

6 years agoMerge "Fix new DataUsageSummary page line spacing." into pi-dev
Sundeep Ghuman [Wed, 14 Mar 2018 06:06:44 +0000 (06:06 +0000)]
Merge "Fix new DataUsageSummary page line spacing." into pi-dev
am: 9f6ee6e1f8

Change-Id: I0eb675f86c3b3da8d7efd049f311484847e68a6b

6 years agoMerge "Add dialog for summary tip" into pi-dev
jackqdyulei [Wed, 14 Mar 2018 06:00:36 +0000 (06:00 +0000)]
Merge "Add dialog for summary tip" into pi-dev
am: 349c9b2691

Change-Id: I189eb9e680baa9d40ae31dab1fc1aa3fae81d00e

6 years agoMerge "Fix new DataUsageSummary page line spacing." into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 06:00:29 +0000 (06:00 +0000)]
Merge "Fix new DataUsageSummary page line spacing." into pi-dev

6 years agoMerge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev
Lei Yu [Wed, 14 Mar 2018 05:59:24 +0000 (05:59 +0000)]
Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev
am: 61bdf047a4

Change-Id: I5d6560a63ec8d9d906c2bcc3f2536f9032875ca0

6 years agoMerge "Add Data warning and limit footer text." into pi-dev
Sundeep Ghuman [Wed, 14 Mar 2018 05:54:20 +0000 (05:54 +0000)]
Merge "Add Data warning and limit footer text." into pi-dev
am: a41941ce39

Change-Id: I01e218c63c4b3955defdc54ada55903888cce6b9

6 years agoMerge "Add dialog for summary tip" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 05:47:12 +0000 (05:47 +0000)]
Merge "Add dialog for summary tip" into pi-dev

6 years agoMerge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 05:47:10 +0000 (05:47 +0000)]
Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev

6 years agoMerge "Add Data warning and limit footer text." into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 05:44:44 +0000 (05:44 +0000)]
Merge "Add Data warning and limit footer text." into pi-dev

6 years agoMerge "Change the color of the measurement numbers below the data bar." into pi-dev
Andreas Terzis [Wed, 14 Mar 2018 04:09:53 +0000 (04:09 +0000)]
Merge "Change the color of the measurement numbers below the data bar." into pi-dev
am: b687dac159

Change-Id: I8a90af2a6bfc35de53c5b9e5d9ecd2b582ed6c2d

6 years agoMerge "Change the color of the measurement numbers below the data bar." into pi-dev
Andreas Terzis [Wed, 14 Mar 2018 03:58:32 +0000 (03:58 +0000)]
Merge "Change the color of the measurement numbers below the data bar." into pi-dev

6 years agoMerge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
Dianne Hackborn [Wed, 14 Mar 2018 03:15:39 +0000 (03:15 +0000)]
Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
am: 2dc4e36a2c

Change-Id: I4e74cc4be5b45dad4772610adf1aded89e6f19d9

6 years agoMerge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
Dianne Hackborn [Wed, 14 Mar 2018 03:02:20 +0000 (03:02 +0000)]
Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev

6 years agoMerge "Fix alignment for the instant app button." into pi-dev
Doris Ling [Wed, 14 Mar 2018 01:10:37 +0000 (01:10 +0000)]
Merge "Fix alignment for the instant app button." into pi-dev
am: 2dd0a66c81

Change-Id: I0d817a996ee558a3aa6f962ed0c3eccc45ce59eb

6 years agoFix new DataUsageSummary page line spacing.
Sundeep Ghuman [Tue, 13 Mar 2018 03:28:09 +0000 (20:28 -0700)]
Fix new DataUsageSummary page line spacing.

There are still some unspecified items pending UX. Have left comments on
ag/3702541 to avoid regressions.

Bug: 70950124
Test: UI change only, no code to test.
Change-Id: I7fa96134af750d71786d031652162aed6bffbeb5

6 years agoMerge "Made ordering in the Sound settings page more sparse to allow injecting tiles...
Katsiaryna Naliuka [Wed, 14 Mar 2018 00:55:10 +0000 (00:55 +0000)]
Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev
am: 2ae02f56fb

Change-Id: I86f951720246dadd5835dfae8ecbfa3158adc16e

6 years agoMerge "Fix alignment for the instant app button." into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 00:28:12 +0000 (00:28 +0000)]
Merge "Fix alignment for the instant app button." into pi-dev

6 years agoChange default value for SOFT_AP_TIMEOUT_ENABLED
Lei Yu [Wed, 14 Mar 2018 00:20:16 +0000 (17:20 -0700)]
Change default value for SOFT_AP_TIMEOUT_ENABLED

Change the default value to 1.

Change-Id: I78a69d6224ad417537be59ce51357e1093d6bae4
Fixes: 73501186
Test: RunSettingsRoboTests

6 years agoFix the system crash issue when secondary user clicks any 802.1x AP on
Ecco Park [Mon, 12 Mar 2018 18:37:51 +0000 (11:37 -0700)]
Fix the system crash issue when secondary user clicks any 802.1x AP on
Wifi Picker.

Catch the exception when keystore failed to list the certs

Bug: 73794111
Test: test it with clicking the Google-A on Wifi Picker.
Test: make ROBOTEST_FILTER="(WifiConfigControllerTest)"
RunSettingsRoboTests -j32
RunSettingsRoboTests: OK (12 tests)

Change-Id: I0db66730261c72ef35d1b299bacd2aed7710d247

6 years agoMerge "Made ordering in the Sound settings page more sparse to allow injecting tiles...
Katsiaryna Naliuka [Tue, 13 Mar 2018 23:29:01 +0000 (23:29 +0000)]
Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev

6 years agoUpdate strings for location
Lei Yu [Fri, 9 Mar 2018 02:24:44 +0000 (18:24 -0800)]
Update strings for location

Bug: 65626601
Test: Screenshot
Change-Id: I66dc675246e3a15069821fddb9d02123429c3722

6 years agoAdd dialog for summary tip
jackqdyulei [Wed, 28 Feb 2018 19:21:39 +0000 (11:21 -0800)]
Add dialog for summary tip

Also change SummaryTip to store the time data, which is used
in the dialog. If "Full last charge" time is available, show
normal message otherwise show message without it.

Bug: 72997971
Test: RunSettingsRoboTests
Change-Id: I4ce94f0935465a18275edb13e3be343313427c3b