git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Jan Nordqvist [Fri, 16 Mar 2018 17:46:54 +0000 (17:46 +0000)]

Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev am: 6b65ffaab7
am: b1d3e89372

Change-Id: I6c4045aed589dc4f11a70cb8c4475357052ce12b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Julia Reynolds [Fri, 16 Mar 2018 16:41:52 +0000 (16:41 +0000)]

Merge "Fix channel screen launching" into pi-dev am: a0cb928098
am: cc611845bf

Change-Id: I1ec1459dd06065228957991ce4a04954dcd3c1dd

commit | commitdiff | tree

Alison Cichowlas [Fri, 16 Mar 2018 16:23:48 +0000 (16:23 +0000)]

Merge "Sort Uncategorized channel to the bottom." into pi-dev am: 97f63ba910
am: 3aaf3bcc52

Change-Id: Ibd106a3ce049eb90263f69878088b91e3e8dc359

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Julia Reynolds [Fri, 16 Mar 2018 15:45:05 +0000 (15:45 +0000)]

Merge "Fix channel screen launching" into pi-dev

commit | commitdiff | tree

Alison Cichowlas [Fri, 16 Mar 2018 15:44:12 +0000 (15:44 +0000)]

Merge "Sort Uncategorized channel to the bottom." into pi-dev

commit | commitdiff | tree

Adam Newman [Fri, 16 Mar 2018 14:55:08 +0000 (14:55 +0000)]

Merge "Enable launching captive portal directly" into pi-dev am: 2483a40841
am: 4b8efabd20

Change-Id: I74f3634e25dfe0e6f20ff6441f412bc272cd72fe

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Newman [Fri, 16 Mar 2018 14:26:25 +0000 (14:26 +0000)]

Merge "Enable launching captive portal directly" into pi-dev

commit | commitdiff | tree

Alan Viverette [Fri, 16 Mar 2018 14:21:51 +0000 (14:21 +0000)]

Restore "Update for 1.0.0-beta1" am: 4734b3448a
am: bba48f3184

Change-Id: I3f94b2e1d914a9fedb087b348bea537783a51637

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Alan Viverette [Thu, 15 Mar 2018 21:03:03 +0000 (21:03 +0000)]

Merge "Revert "Update for 1.0.0-beta1"" into pi-dev am: 767743d64d
am: 5853856ead

Change-Id: I7615fbcdaf6f77385e487fd92cf51dd3a10ed9ad

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Newman [Thu, 15 Mar 2018 20:37:22 +0000 (20:37 +0000)]

Merge "Enable launching captive portal directly"

commit | commitdiff | tree

Alan Viverette [Thu, 15 Mar 2018 20:04:22 +0000 (20:04 +0000)]

Merge "Revert "Update for 1.0.0-beta1"" into pi-dev

commit | commitdiff | tree

Lei Yu [Thu, 15 Mar 2018 19:37:27 +0000 (19:37 +0000)]

Merge "Update strings for location" into pi-dev am: 4aff464a39
am: e139ef5552

Change-Id: I3870629a47447f4ee658604ad4a840303baaeafc

commit | commitdiff | tree

Lei Yu [Thu, 15 Mar 2018 19:23:19 +0000 (19:23 +0000)]

Merge "Update the restrict app list" into pi-dev am: 992444b726
am: a5a288f873

Change-Id: Iac997edfb8d3bce2be4a53a38c29c88b06fed55b

commit | commitdiff | tree

Neil Fuller [Thu, 15 Mar 2018 19:09:56 +0000 (19:09 +0000)]

Merge "Track changes in libcore" into pi-dev am: ea2ef1af44
am: 082dd24a7e

Change-Id: Id30429da4c06994f92bab507bc2e80ca6040f10c

commit | commitdiff | tree

Lei Yu [Thu, 15 Mar 2018 19:09:23 +0000 (19:09 +0000)]

Merge "Add dialog when restrict apps are more than 5" into pi-dev am: 34bfe74249
am: 137be5de5b

Change-Id: I83fabfcfb62c53b9cd54be285aa1e165f7047122

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 15 Mar 2018 18:30:24 +0000 (18:30 +0000)]

Merge "Update strings for location" into pi-dev

commit | commitdiff | tree

Lei Yu [Thu, 15 Mar 2018 18:28:48 +0000 (18:28 +0000)]

Merge "Update the restrict app list" into pi-dev

commit | commitdiff | tree

Neil Fuller [Thu, 15 Mar 2018 18:26:36 +0000 (18:26 +0000)]

Merge "Track changes in libcore" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Sundeep Ghuman [Thu, 15 Mar 2018 17:40:10 +0000 (17:40 +0000)]

Merge "Change text for data warning and data limit." into pi-dev am: b673aaadc9
am: b4c8282929

Change-Id: I62afb3eae9de961145cf2e8c356d1fc1fb27494f

commit | commitdiff | tree

Lei Yu [Thu, 15 Mar 2018 17:31:21 +0000 (17:31 +0000)]

Merge "Update string in battery app info page" into pi-dev am: e5c7317f3f
am: adb61e0828

Change-Id: If2abd04bd55e73e2f9123357333f4be234a893be

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lei Yu [Thu, 15 Mar 2018 17:06:00 +0000 (17:06 +0000)]

Merge "Update string in battery app info page" into pi-dev

commit | commitdiff | tree

Adam Newman [Fri, 9 Mar 2018 00:59:34 +0000 (16:59 -0800)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Brad Ebinger [Thu, 15 Mar 2018 16:27:38 +0000 (16:27 +0000)]

Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev am: ab988900c4 -s ours
am: cfa9346d12 -s ours

Change-Id: I872ac33f426c3c43d1918b501062bd81d53b7256

commit | commitdiff | tree

Suresh Koleti [Thu, 15 Mar 2018 16:24:20 +0000 (16:24 +0000)]

Donot disable Wi-Fi Calling when getting "registration error" intent. am: 87e0d43237 -s ours
am: c565ddff96 -s ours

Change-Id: Iacfb756c6e7f6573e655eacc36d5dd556b6117e6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sundeep Ghuman [Thu, 15 Mar 2018 16:08:16 +0000 (16:08 +0000)]

Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev am: 437d421eaf
am: 3efee3606d

Change-Id: I701d6a4d252b88661cf932ef13c41fc17e5a1000

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Alan Viverette [Thu, 15 Mar 2018 14:08:11 +0000 (14:08 +0000)]

Merge "Update for 1.0.0-beta1" into pi-dev am: 3618f68c01
am: f5bbe75951

Change-Id: Ie4c6ed581637cee25b2339474d68f9362be3659a

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Viverette [Thu, 15 Mar 2018 13:32:16 +0000 (13:32 +0000)]

Merge "Update for 1.0.0-beta1" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Søren Gjesse [Thu, 15 Mar 2018 07:23:50 +0000 (07:23 +0000)]

Merge "Disable R8 for Settings"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andrew Sapperstein [Thu, 15 Mar 2018 05:48:04 +0000 (05:48 +0000)]

Merge "update the whitelist for anomaly detection" into pi-dev am: eb029cffaf
am: ce11c1b5e2

Change-Id: Ibe1684f1d4c8979362e1cf5b1e814473b50d9468

commit | commitdiff | tree

Sundeep Ghuman [Thu, 15 Mar 2018 05:37:10 +0000 (05:37 +0000)]

Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev am: d610e51613
am: dfaa287e43

Change-Id: Ide44504a4dc52b67f759343e32e74d501a80dccf

commit | commitdiff | tree

Andrew Sapperstein [Thu, 15 Mar 2018 05:24:03 +0000 (05:24 +0000)]

Merge "Rename Mobile data usage to App data usage & hide summary" into pi-dev am: 0f6ff091b4
am: 56fa9159fb

Change-Id: I210be4a55c1f265bfacad04cb766931e7d34405f

commit | commitdiff | tree

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

commit | commitdiff | tree

Andrew Sapperstein [Thu, 15 Mar 2018 05:09:59 +0000 (05:09 +0000)]

Merge "update the whitelist for anomaly detection" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sundeep Ghuman [Thu, 15 Mar 2018 05:00:41 +0000 (05:00 +0000)]

Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Søren Gjesse [Wed, 14 Mar 2018 17:31:07 +0000 (18:31 +0100)]

Disable R8 for Settings

This failure seems related to R8:

https://sponge.corp.google.com/target?show=FAILED&sortBy=STATUS&id=4f1b303e-ef57-4dc6-9ebb-95ca5cda398e&target=com.android.settings.tests.unit:

java.lang.InstantiationError: com.android.settings.bluetooth.Utf8ByteLengthFilter
at com.android.settings.bluetooth.Utf8ByteLengthFilterTest.testFilter(Utf8ByteLengthFilterTest.java:34)
at java.lang.reflect.Method.invoke(Native Method)
at junit.framework.TestCase.runTest(TestCase.java:168)
at junit.framework.TestCase.runBare(TestCase.java:134)
at junit.framework.TestResult$1.protect(TestResult.java:115)
at android.support.test.internal.runner.junit3.AndroidTestResult.runProtected(AndroidTestResult.java:73)
at junit.framework.TestResult.run(TestResult.java:118)
at android.support.test.internal.runner.junit3.AndroidTestResult.run(AndroidTestResult.java:51)
at junit.framework.TestCase.run(TestCase.java:124)
at android.support.test.internal.runner.junit3.NonLeakyTestSuite$NonLeakyTest.run(NonLeakyTestSuite.java:62)
at android.support.test.internal.runner.junit3.AndroidTestSuite$2.run(AndroidTestSuite.java:101)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:458)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641)
at java.lang.Thread.run(Thread.java:764)

Bug: 74756073
Test: Run Settings tests, and the failure above is gone.
Change-Id: I6071ae59f51ab5d56243774855ecc845267e7103

commit | commitdiff | tree

Yuchen Chang [Wed, 14 Mar 2018 18:29:32 +0000 (18:29 +0000)]

Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev am: 4786291624
am: 76fe8d54b1

Change-Id: I31f8ab52294729f685591d33384b878e34247cd5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Phil Weaver [Wed, 14 Mar 2018 16:59:53 +0000 (16:59 +0000)]

Merge "Show default a11y icon in shortcut menu" into pi-dev am: 920548005b
am: 7e0c9fc818

Change-Id: I5af08aa87fcac7048a4bd641d3c74285fa97421a

commit | commitdiff | tree

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

commit | commitdiff | tree

Phil Weaver [Wed, 14 Mar 2018 16:45:49 +0000 (16:45 +0000)]

Merge "Show default a11y icon in shortcut menu" into pi-dev

commit | commitdiff | tree

Phil Weaver [Wed, 14 Mar 2018 16:39:40 +0000 (16:39 +0000)]

Merge "Don't pre-scale vector drawables in settings" into pi-dev am: be27390af8
am: 6e12a4d85c

Change-Id: I0d1857b36106e68d7512f2ac29ac763109be2f8b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Ecco Park [Wed, 14 Mar 2018 07:09:08 +0000 (07:09 +0000)]

Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev am: de08983dd2
am: 02d22b46ac

Change-Id: I3c6a95aa878022589c395db16806f43ad4795d52

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sundeep Ghuman [Wed, 14 Mar 2018 06:15:32 +0000 (06:15 +0000)]

Merge "Fix new DataUsageSummary page line spacing." into pi-dev am: 9f6ee6e1f8
am: 3791411b62

Change-Id: Idcb170195d6867f0480abf6ba7ac445aee5c2305

commit | commitdiff | tree

jackqdyulei [Wed, 14 Mar 2018 06:14:56 +0000 (06:14 +0000)]

Merge "Add dialog for summary tip" into pi-dev am: 349c9b2691
am: e107c4394f

Change-Id: Icbd24c8c8d9eb4ab22bfee7c46a9e4c72b7d3466

commit | commitdiff | tree

Lei Yu [Wed, 14 Mar 2018 06:13:46 +0000 (06:13 +0000)]

Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev am: 61bdf047a4
am: 4aaa8df9d0

Change-Id: I19629525cf265267ca2560d3c6c8c1f66b708d9e

commit | commitdiff | tree

TreeHugger Robot [Wed, 14 Mar 2018 06:12:47 +0000 (06:12 +0000)]

Merge "Not all selected languages are deleted in language preferences"

commit | commitdiff | tree

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

commit | commitdiff | tree

Sundeep Ghuman [Wed, 14 Mar 2018 06:05:31 +0000 (06:05 +0000)]

Merge "Add Data warning and limit footer text." into pi-dev am: a41941ce39
am: a543aa03e7

Change-Id: I28977f7c7878b04959f12000a1feaffe2ae761e3

commit | commitdiff | tree

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