Neil Fuller
42123c413e
Merge "Track changes in libcore" into pi-dev am: ea2ef1af44
...
am: 082dd24a7e
Change-Id: Id30429da4c06994f92bab507bc2e80ca6040f10c
2018-03-15 19:09:56 +00:00
Lei Yu
33f3c7036b
Merge "Add dialog when restrict apps are more than 5" into pi-dev am: 34bfe74249
...
am: 137be5de5b
Change-Id: I83fabfcfb62c53b9cd54be285aa1e165f7047122
2018-03-15 19:09:23 +00:00
Neil Fuller
ea2ef1af44
Merge "Track changes in libcore" into pi-dev
2018-03-15 18:26:36 +00:00
Lei Yu
34bfe74249
Merge "Add dialog when restrict apps are more than 5" into pi-dev
2018-03-15 18:01:58 +00:00
Sundeep Ghuman
f2b1c96a58
Merge "Change text for data warning and data limit." into pi-dev am: b673aaadc9
...
am: b4c8282929
Change-Id: I62afb3eae9de961145cf2e8c356d1fc1fb27494f
2018-03-15 17:40:10 +00:00
Lei Yu
2c4dd8831d
Merge "Update string in battery app info page" into pi-dev am: e5c7317f3f
...
am: adb61e0828
Change-Id: If2abd04bd55e73e2f9123357333f4be234a893be
2018-03-15 17:31:21 +00:00
Sundeep Ghuman
b673aaadc9
Merge "Change text for data warning and data limit." into pi-dev
2018-03-15 17:08:34 +00:00
Lei Yu
e5c7317f3f
Merge "Update string in battery app info page" into pi-dev
2018-03-15 17:06:00 +00:00
Jan Nordqvist
7b352d271e
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
2018-03-15 09:49:32 -07: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
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
3618f68c01
Merge "Update for 1.0.0-beta1" into pi-dev
2018-03-15 13:32:16 +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
eb029cffaf
Merge "update the whitelist for anomaly detection" into pi-dev
2018-03-15 05:09:59 +00:00
Sundeep Ghuman
d610e51613
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
2018-03-15 05:00:41 +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
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
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
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
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
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
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
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
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
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
Lei Yu
f4318f613d
update the whitelist for anomaly detection
...
Add "allow-in-power-save-except-idle" to whitelist. Also ignore
all the system uids
Bug: 74241534
Test: RunSettingsRoboTests
Change-Id: I593e558168db339f6f38c7f78ab4fd63f99b16ab
2018-03-13 12:28:35 -07: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
Beverly Tai
060f852332
Merge "Adding zen duration preference" into pi-dev am: e652a039af
...
am: 797d541953
Change-Id: I294a0691c708066d22d2b569ff7678ae9bb47848
2018-03-13 01:12:33 +00:00
Doris Ling
0b5582fe14
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev am: 425f033782
...
am: 1c088eb185
Change-Id: I3ca913ab7ffcdec2ede4d7fad39e89dd4f376492
2018-03-12 23:19:48 +00:00
Alan Viverette
6b1fd5cfa9
Update for 1.0.0-beta1
...
Bug: 74449147
Test: make
Change-Id: I664b5f29efbb5d6c40420c0d8aaa8629ddfcd31b
2018-03-12 23:08:35 +00:00
Beverly Tai
e652a039af
Merge "Adding zen duration preference" into pi-dev
2018-03-12 21:39:18 +00:00
TreeHugger Robot
5906621ea4
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
2018-03-12 21:08:59 +00:00
TreeHugger Robot
425f033782
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev
2018-03-12 19:36:32 +00:00
Beverly
170b88c6fc
Test for string changes in DND Sound Settings
...
Test: this
Change-Id: I47ba1d1bad6a5be04d718d2e58eaf5dd6c69f107
Fixes: 74529508
2018-03-12 14:35:27 -04:00
Ben Lin
aedf00c4f8
Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev
2018-03-12 17:52:47 +00:00