Brad Ebinger
0f382f5656
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
2018-03-15 16:27:38 +00:00
Suresh Koleti
e2230435c5
Donot disable Wi-Fi Calling when getting "registration error" intent. am: 87e0d43237 -s ours
...
am: c565ddff96 -s ours
Change-Id: Iacfb756c6e7f6573e655eacc36d5dd556b6117e6
2018-03-15 16:24:20 +00:00
Brad Ebinger
cfa9346d12
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev
...
am: ab988900c4 -s ours
Change-Id: I9c9d6c5062f20d9c84a7c1ac8ff7e97b473f916e
2018-03-15 16:19:32 +00:00
Suresh Koleti
c565ddff96
Donot disable Wi-Fi Calling when getting "registration error" intent.
...
am: 87e0d43237 -s ours
Change-Id: Ic79f29b10792a680f846322bafa8b504a3325ff2
2018-03-15 16:18:49 +00:00
Sundeep Ghuman
34aa694717
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev am: 437d421eaf
...
am: 3efee3606d
Change-Id: I701d6a4d252b88661cf932ef13c41fc17e5a1000
2018-03-15 16:08:16 +00:00
Brad Ebinger
ab988900c4
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev
2018-03-15 16:04:56 +00:00
Sundeep Ghuman
3efee3606d
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
...
am: 437d421eaf
Change-Id: I346e1868268fa53979886cf4a9c9bb0cebf9af9a
2018-03-15 15:54:16 +00:00
Sundeep Ghuman
437d421eaf
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.
2018-03-15 15:43:17 +00:00
Alan Viverette
b15d01f415
Merge "Update for 1.0.0-beta1" into pi-dev am: 3618f68c01
...
am: f5bbe75951
Change-Id: Ie4c6ed581637cee25b2339474d68f9362be3659a
2018-03-15 14:08:11 +00:00
Alan Viverette
f5bbe75951
Merge "Update for 1.0.0-beta1" into pi-dev
...
am: 3618f68c01
Change-Id: I66ac7416a3aa3cccbd22ca4b2b934dcfff0a4893
2018-03-15 13:59:45 +00:00
Julia Reynolds
9aac3ce9ed
Add placeholder on DND settings screen
...
Bug: 74321426
Test: make -j20 RunSettingsRoboTests
Change-Id: Icb7d21e342af85d1ad83e89efa2fe9a1d41e710b
2018-03-15 09:34:03 -04:00
Alan Viverette
3618f68c01
Merge "Update for 1.0.0-beta1" into pi-dev
2018-03-15 13:32:16 +00:00
Julia Reynolds
ee5870bac6
Fix channel screen launching
...
Test: launch channel screen from Settings & external app
Change-Id: Ib9add2f25cbacde192095407b83b17438946a493
Fixes: 73814186
2018-03-15 08:37:59 -04:00
Søren Gjesse
8c77f8e33e
Merge "Disable R8 for Settings"
2018-03-15 07:23:50 +00:00
Jan Nordqvist
9a65e5fec7
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
2018-03-15 00:20:39 -07:00
Jan Nordqvist
a6f6e9c41c
In Data Usage screen, Below the data bar, Add “X days left” field.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I35eb3f0c09c84d609ad54e87400913ec77e19ea0
2018-03-15 00:17:53 -07:00
Sundeep Ghuman
21ef6cb644
In Data Usage screen, add over-limit state.
...
Bug: 70950124
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: Ieec0c486c6a5451cd5983f02e202ddac3413a602
2018-03-14 23:22:30 -07:00
Jan Nordqvist
8a241f642e
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
2018-03-14 22:48:46 -07:00
Andrew Sapperstein
c69e6ea4bf
Merge "update the whitelist for anomaly detection" into pi-dev am: eb029cffaf
...
am: ce11c1b5e2
Change-Id: Ibe1684f1d4c8979362e1cf5b1e814473b50d9468
2018-03-15 05:48:04 +00:00
Sundeep Ghuman
7087d24f82
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev am: d610e51613
...
am: dfaa287e43
Change-Id: Ide44504a4dc52b67f759343e32e74d501a80dccf
2018-03-15 05:37:10 +00:00
Andrew Sapperstein
275095f282
Merge "Rename Mobile data usage to App data usage & hide summary" into pi-dev am: 0f6ff091b4
...
am: 56fa9159fb
Change-Id: I210be4a55c1f265bfacad04cb766931e7d34405f
2018-03-15 05:24:03 +00:00
Andrew Sapperstein
ce11c1b5e2
Merge "update the whitelist for anomaly detection" into pi-dev
...
am: eb029cffaf
Change-Id: Ib30f325cd325099cf2a9909924227f99cb23b4ee
2018-03-15 05:16:29 +00:00
Andrew Sapperstein
eb029cffaf
Merge "update the whitelist for anomaly detection" into pi-dev
2018-03-15 05:09:59 +00:00
Sundeep Ghuman
dfaa287e43
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
...
am: d610e51613
Change-Id: I04c04bf38ef388ddd99827407659327222aa7f44
2018-03-15 05:09:41 +00:00
Andrew Sapperstein
56fa9159fb
Merge "Rename Mobile data usage to App data usage & hide summary" into pi-dev
...
am: 0f6ff091b4
Change-Id: Ib5a548c80fb2e0c7afeb0df9e4e1c368ec9be65f
2018-03-15 05:08:47 +00:00
Sundeep Ghuman
d610e51613
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
2018-03-15 05:00:41 +00:00
Andrew Sapperstein
0f6ff091b4
Merge "Rename “Mobile data usage” to “App data usage” & hide summary" into pi-dev
2018-03-15 04:58:42 +00:00
Lei Yu
8d1e9fe6d6
Update string in battery app info page
...
Change-Id: I78ce7499f10bb65d44865349738bf77300180867
Fixes: 73576591
Bugs: 73018395
Test: Manual
2018-03-14 17:02:30 -07:00
Sundeep Ghuman
ea8d866337
Fix the ProgressBar in DataUsageSummaryV2 page.
...
Bug: 70950124
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: I83f268c0824d9e3520899725fa572753e1de0814
2018-03-14 16:21:46 -07:00
Søren Gjesse
f416cf775e
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
2018-03-14 19:47:58 +01:00
Yuchen Chang
f2b0bb1b67
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev am: 4786291624
...
am: 76fe8d54b1
Change-Id: I31f8ab52294729f685591d33384b878e34247cd5
2018-03-14 18:29:32 +00:00
Andreas Terzis
b8642b79c3
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
2018-03-14 11:03:21 -07:00
Yuchen Chang
76fe8d54b1
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev
...
am: 4786291624
Change-Id: I6f3596bb4cde597c9fd72804432aa272504aff0e
2018-03-14 17:54:35 +00:00
Lei Yu
888ea9ef1f
Add dialog when restrict apps are more than 5
...
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Iec24fc1ce8e5840207610b3155dffa7059f9aa49
2018-03-14 10:18:20 -07:00
Neil Fuller
6fd477debb
Track changes in libcore
...
Track method parameter changes in libcore.
Bug: 72142943
Test: Build only
Change-Id: I85396aeea98eaa8c093115ee52b52e22d1a4aa2b
2018-03-14 17:11:44 +00:00
TreeHugger Robot
4786291624
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev
2018-03-14 17:11:37 +00:00
Phil Weaver
522e3830dd
Merge "Show default a11y icon in shortcut menu" into pi-dev am: 920548005b
...
am: 7e0c9fc818
Change-Id: I5af08aa87fcac7048a4bd641d3c74285fa97421a
2018-03-14 16:59:53 +00:00
Phil Weaver
7e0c9fc818
Merge "Show default a11y icon in shortcut menu" into pi-dev
...
am: 920548005b
Change-Id: Ic132edde69bb1b2feb93f209cc4deab12f3a80f1
2018-03-14 16:52:54 +00:00
Phil Weaver
920548005b
Merge "Show default a11y icon in shortcut menu" into pi-dev
2018-03-14 16:45:49 +00:00
Phil Weaver
c725c7c4c2
Merge "Don't pre-scale vector drawables in settings" into pi-dev am: be27390af8
...
am: 6e12a4d85c
Change-Id: I0d1857b36106e68d7512f2ac29ac763109be2f8b
2018-03-14 16:39:40 +00:00
Phil Weaver
6e12a4d85c
Merge "Don't pre-scale vector drawables in settings" into pi-dev
...
am: be27390af8
Change-Id: I7690249ea06347b5ecf1c58528710b426dc323c2
2018-03-14 16:25:48 +00:00
Phil Weaver
be27390af8
Merge "Don't pre-scale vector drawables in settings" into pi-dev
2018-03-14 16:03:28 +00:00
Yuchen Chang
1bf069f839
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
2018-03-14 17:18:39 +08:00
Ecco Park
3c6c75fbc8
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
2018-03-14 07:09:08 +00:00
Ecco Park
02d22b46ac
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
2018-03-14 07:03:09 +00:00
TreeHugger Robot
de08983dd2
Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev
2018-03-14 06:53:12 +00:00
Sundeep Ghuman
0e1fdfd472
Merge "Fix new DataUsageSummary page line spacing." into pi-dev am: 9f6ee6e1f8
...
am: 3791411b62
Change-Id: Idcb170195d6867f0480abf6ba7ac445aee5c2305
2018-03-14 06:15:32 +00:00
jackqdyulei
e99d8c0f09
Merge "Add dialog for summary tip" into pi-dev am: 349c9b2691
...
am: e107c4394f
Change-Id: Icbd24c8c8d9eb4ab22bfee7c46a9e4c72b7d3466
2018-03-14 06:14:56 +00:00
Lei Yu
d94fa53b40
Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev am: 61bdf047a4
...
am: 4aaa8df9d0
Change-Id: I19629525cf265267ca2560d3c6c8c1f66b708d9e
2018-03-14 06:13:46 +00:00
TreeHugger Robot
e5651c0566
Merge "Not all selected languages are deleted in language preferences"
2018-03-14 06:12:47 +00:00