Commit Graph

43353 Commits

Author SHA1 Message Date
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
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
Sundeep Ghuman
3791411b62 Merge "Fix new DataUsageSummary page line spacing." into pi-dev
am: 9f6ee6e1f8

Change-Id: I0eb675f86c3b3da8d7efd049f311484847e68a6b
2018-03-14 06:06:44 +00:00
Sundeep Ghuman
8d0f26f621 Merge "Add Data warning and limit footer text." into pi-dev am: a41941ce39
am: a543aa03e7

Change-Id: I28977f7c7878b04959f12000a1feaffe2ae761e3
2018-03-14 06:05:31 +00:00
jackqdyulei
e107c4394f Merge "Add dialog for summary tip" into pi-dev
am: 349c9b2691

Change-Id: I189eb9e680baa9d40ae31dab1fc1aa3fae81d00e
2018-03-14 06:00:36 +00:00
TreeHugger Robot
9f6ee6e1f8 Merge "Fix new DataUsageSummary page line spacing." into pi-dev 2018-03-14 06:00:29 +00:00
Lei Yu
4aaa8df9d0 Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev
am: 61bdf047a4

Change-Id: I5d6560a63ec8d9d906c2bcc3f2536f9032875ca0
2018-03-14 05:59:24 +00:00
Sundeep Ghuman
a543aa03e7 Merge "Add Data warning and limit footer text." into pi-dev
am: a41941ce39

Change-Id: I01e218c63c4b3955defdc54ada55903888cce6b9
2018-03-14 05:54:20 +00:00
TreeHugger Robot
349c9b2691 Merge "Add dialog for summary tip" into pi-dev 2018-03-14 05:47:12 +00:00
TreeHugger Robot
61bdf047a4 Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev 2018-03-14 05:47:10 +00:00
TreeHugger Robot
a41941ce39 Merge "Add Data warning and limit footer text." into pi-dev 2018-03-14 05:44:44 +00:00
Andreas Terzis
b6756fc770 Merge "Change the color of the measurement numbers below the data bar." into pi-dev am: b687dac159
am: a745277b34

Change-Id: I7dfae909ddc53c54143d1110b3a61bf55fea6495
2018-03-14 05:14:26 +00:00
Dianne Hackborn
0516c12710 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev am: 2dc4e36a2c
am: 214d4dc523

Change-Id: I434b797747caaa5daade122bf54ce5168245360f
2018-03-14 04:55:52 +00:00
Andreas Terzis
a745277b34 Merge "Change the color of the measurement numbers below the data bar." into pi-dev
am: b687dac159

Change-Id: I8a90af2a6bfc35de53c5b9e5d9ecd2b582ed6c2d
2018-03-14 04:09:53 +00:00
Andreas Terzis
b687dac159 Merge "Change the color of the measurement numbers below the data bar." into pi-dev 2018-03-14 03:58:32 +00:00
Dianne Hackborn
214d4dc523 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
am: 2dc4e36a2c

Change-Id: I4e74cc4be5b45dad4772610adf1aded89e6f19d9
2018-03-14 03:15:39 +00:00
Dianne Hackborn
2dc4e36a2c Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev 2018-03-14 03:02:20 +00:00
Doris Ling
c149594bfa Merge "Fix alignment for the instant app button." into pi-dev am: 2dd0a66c81
am: 03c8f085e3

Change-Id: I6a9eacc4d21a468ead9698775f71ed204a342d29
2018-03-14 02:07:46 +00:00
Katsiaryna Naliuka
30464e1b8c Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev am: 2ae02f56fb
am: 40dc8a5249

Change-Id: If81076d1b18240a23e1f2f41d3f0cc8b2ac3652c
2018-03-14 01:25:13 +00:00
Doris Ling
03c8f085e3 Merge "Fix alignment for the instant app button." into pi-dev
am: 2dd0a66c81

Change-Id: I0d817a996ee558a3aa6f962ed0c3eccc45ce59eb
2018-03-14 01:10:37 +00:00
Sundeep Ghuman
101c1d09e1 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
2018-03-13 17:56:19 -07:00
Katsiaryna Naliuka
40dc8a5249 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
2018-03-14 00:55:10 +00:00
TreeHugger Robot
2dd0a66c81 Merge "Fix alignment for the instant app button." into pi-dev 2018-03-14 00:28:12 +00:00
Lei Yu
70d71748f4 Change default value for SOFT_AP_TIMEOUT_ENABLED
Change the default value to 1.

Change-Id: I78a69d6224ad417537be59ce51357e1093d6bae4
Fixes: 73501186
Test: RunSettingsRoboTests
2018-03-13 17:20:16 -07:00
Ecco Park
bffd531aa3 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
2018-03-13 16:49:08 -07:00
Katsiaryna Naliuka
2ae02f56fb Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev 2018-03-13 23:29:01 +00:00
Doris Ling
72f1450bad Merge "Fix presubmit test failure." into pi-dev am: ceaa6c5a0b
am: 1b2e1511ca

Change-Id: I1504525336602ac4db33f9e58ffefd7ecd14db2a
2018-03-13 23:21:12 +00:00
Android Build Merger (Role)
39f5286a3e Merge "Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114 am: 57cda98f4c" 2018-03-13 23:08:42 +00:00
Doris Ling
668d9b733c Merge "Revert "[Settings] Request focus in Add network dialog"" 2018-03-13 22:49:35 +00:00
Beverly
917c8fb21e Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114
am: 57cda98f4c

Change-Id: I102fc43f6dc91f1bbeefdea822007475f0645768
2018-03-13 22:35:42 +00:00
jackqdyulei
ede87ce19f 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
2018-03-13 15:23:20 -07:00
Doris Ling
9e04a917b6 Fix alignment for the instant app button.
- wrap the secondary button in the FrameLayout to make it align properly
with the primary button.

Change-Id: I6964bc67773a77eae551521747c19898a2f22210
Fixes: 69562807
Test: visual
2018-03-13 14:38:33 -07:00
Sundeep Ghuman
5fc38ecae9 Add Data warning and limit footer text.
Bug: 70550124
Test: XML only change, visual inspection.
Change-Id: Iaea3f100051bb908b13ca6809463db7f01f8d92d
2018-03-13 14:21:36 -07:00
Doris Ling
1b2e1511ca Merge "Fix presubmit test failure." into pi-dev
am: ceaa6c5a0b

Change-Id: I2af70de2d3917b470f78eef5ef920f5de6e42dc9
2018-03-13 21:04:23 +00:00
Andreas Terzis
02e2df71e9 Merge "Increase string character limits to 40" into pi-dev am: 2e7e15c82f
am: 885c503f00

Change-Id: I0becf680a3a0a272abbbb60971de12b556ecdb6b
2018-03-13 21:01:36 +00:00
Beverly
57cda98f4c Merge changes from topic "dnd_touch_sounds" into pi-dev
am: e9fbcd7114

Change-Id: Ie536a0126a05b379d06caceb54681f4757077c7b
2018-03-13 20:34:41 +00:00
TreeHugger Robot
ceaa6c5a0b Merge "Fix presubmit test failure." into pi-dev 2018-03-13 20:18:14 +00:00
Jan Nordqvist
b17180d21a Change the color of the measurement numbers below the data bar.
Original line item: In Data Usage screen, Below the data bar, Make GB measurement numbers smaller.

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: Id30233e038c664539fd688dcd4eb99af0c41f010
2018-03-13 13:12:49 -07:00
Katsiaryna Naliuka
64a89bc9a7 Made ordering in the Sound settings page more sparse to allow injecting
tiles in arbitrary positions.

Also increased a number of settings that are not hidden behind the
overflow to accommodate 1 more line.

Bug: 64065365

Test: manual
Change-Id: I3ac8dfd4802967e02bebc6558a5b96d68cb2ea34
2018-03-13 21:02:55 +01:00
TreeHugger Robot
e9fbcd7114 Merge changes from topic "dnd_touch_sounds" into pi-dev
* changes:
  Test for string changes in DND Sound Settings
  Update seconday text DND Exceptions preference
2018-03-13 19:58:51 +00:00
Andreas Terzis
885c503f00 Merge "Increase string character limits to 40" into pi-dev
am: 2e7e15c82f

Change-Id: I41b251514ac761300e3c1923aa826648b2173e37
2018-03-13 18:31:24 +00:00
Doris Ling
20ed555112 Fix presubmit test failure.
- fix the typo in the manifest that reference the zen mode fragment.

Change-Id: Iae6975d015174fabb98033b917290c954c5483c2
Fixes: 74577539
Test: make SettingsUnitTests
2018-03-13 11:25:04 -07:00
Andreas Terzis
2e7e15c82f Merge "Increase string character limits to 40" into pi-dev 2018-03-13 17:58:12 +00:00
Yuchen Chang
35c14a2ac3 Revert "[Settings] Request focus in Add network dialog"
This reverts commit 49d314f8c3.

Reason for revert: Revert for proper fix in pi-dev branch. Solution in 
 http://ag/3714337 is proper fix to make all case in wifi dialog can get focus.

Change-Id: I99035a4c437ea6c033e3ba6a83e39967c236d973
2018-03-13 05:26:47 +00:00