PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,306 Commits 1 Branch 0 Tags
00bf9363044c3d722503d6cd452f2f1736337304
Commit Graph

43306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerry Zhang
00bf936304 Merge "Update USB settings screen" into pi-dev 
am: d85ef28585

Change-Id: I2eeb0b2e585fd958be20f5831bee4257b1838c92
 2018-03-16 23:12:29 +00:00
Jerry Zhang
d85ef28585 Merge "Update USB settings screen" into pi-dev 2018-03-16 22:40:38 +00:00
Lei Yu
559377618b Merge "Update the wifi off string" into pi-dev 
am: ef0278ae3c

Change-Id: I5e01bef3499120ad709834cff1afa4f4dc956dc6
 2018-03-16 21:47:03 +00:00
Lei Yu
ef0278ae3c Merge "Update the wifi off string" into pi-dev 2018-03-16 21:28:43 +00:00
Julia Reynolds
c34fe741d1 Merge "Link to dnd settings from notification settings" into pi-dev 
am: 5d419a2dcf

Change-Id: I9c70fdc2b327e095a75edc0bd6720e671e8f1436
 2018-03-16 20:00:44 +00:00
Julia Reynolds
5d419a2dcf Merge "Link to dnd settings from notification settings" into pi-dev 2018-03-16 19:43:38 +00:00
Lei Yu
dd4a47f940 Merge "update strings in battery settings(Round 1)" into pi-dev 
am: cf0cae785f

Change-Id: I5a31629dadc6a6119327dc3ba87890670788ce2f
 2018-03-16 18:53:53 +00:00
Lei Yu
cf0cae785f Merge "update strings in battery settings(Round 1)" into pi-dev 2018-03-16 18:26:49 +00:00
Jan Nordqvist
b1d3e89372 Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev 
am: 6b65ffaab7

Change-Id: Ia31548ee407a5a32033f5967d948bd34e5e63049
 2018-03-16 17:38:23 +00:00
Jan Nordqvist
6b65ffaab7 Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev 2018-03-16 17:18:37 +00:00
Julia Reynolds
c35d9b613e Link to dnd settings from notification settings 
Test: make -j20 RunSettingsRoboTests
Change-Id: Idf70155134b2e78bd410468497cabe8faf1557ce
Fixes: 74319354
 2018-03-16 13:14:03 -04:00
Julia Reynolds
cc611845bf Merge "Fix channel screen launching" into pi-dev 
am: a0cb928098

Change-Id: I752695e576eae29650c3d79841b509fb267429b6
 2018-03-16 16:18:23 +00:00
Jan Nordqvist
b65b3ce173 In Data Usage screen, Above the data bar, Change font size of number. 
Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I671a605fe341f36adeb6ae239333295ddfb550c7
 2018-03-16 09:16:26 -07:00
Alison Cichowlas
3aaf3bcc52 Merge "Sort Uncategorized channel to the bottom." into pi-dev 
am: 97f63ba910

Change-Id: I4e272ef729124c926a2de3510985556e5375bfa5
 2018-03-16 16:02:23 +00:00
Julia Reynolds
a0cb928098 Merge "Fix channel screen launching" into pi-dev 2018-03-16 15:45:05 +00:00
Alison Cichowlas
97f63ba910 Merge "Sort Uncategorized channel to the bottom." into pi-dev 2018-03-16 15:44:12 +00:00
Adam Newman
4b8efabd20 Merge "Enable launching captive portal directly" into pi-dev 
am: 2483a40841

Change-Id: I6ee69efe346eff3c391dc9251b9881b23d85042b
 2018-03-16 14:42:19 +00:00
Adam Newman
2483a40841 Merge "Enable launching captive portal directly" into pi-dev 2018-03-16 14:26:25 +00:00
Alan Viverette
bba48f3184 Restore "Update for 1.0.0-beta1" 
am: 4734b3448a

Change-Id: I18ef49f6ed15a3e01b8fda0ab4954f356982facd
 2018-03-16 14:06:33 +00:00
Alan Viverette
4734b3448a Restore "Update for 1.0.0-beta1" 
This reverts commit b4fe52343c.

Bug: 74950017
Test: manual
Change-Id: I9749b9ae8f2f75b1bbdf7c6686a036db1f6f8a74
 2018-03-16 02:13:11 +00:00
Lei Yu
206f406aeb 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
 2018-03-15 17:23:59 -07:00
Jerry Zhang
55d10dff53 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
 2018-03-15 17:18:41 -07:00
Alison Cichowlas
83ca82f749 Sort Uncategorized channel to the bottom. 
Bug: 64803214
Test: manual, with Duo app
Change-Id: I8e39fbed4ecda2efebb4606f38ea934647317207
 2018-03-15 18:11:18 -04:00
Adam Newman
c6b4f3d92c 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 7577624db7)
 2018-03-15 21:05:25 +00:00
Alan Viverette
5853856ead Merge "Revert "Update for 1.0.0-beta1"" into pi-dev 
am: 767743d64d

Change-Id: Ifd2438bfa6947bd98eb4d0a843a689d7790cc6ed
 2018-03-15 20:38:29 +00:00
Alan Viverette
767743d64d Merge "Revert "Update for 1.0.0-beta1"" into pi-dev 2018-03-15 20:04:22 +00:00
Lei Yu
e139ef5552 Merge "Update strings for location" into pi-dev 
am: 4aff464a39

Change-Id: Id638dfc191818a64f669d197395801fb0794aabd
 2018-03-15 18:53:37 +00:00
Alan Viverette
b4fe52343c Revert "Update for 1.0.0-beta1" 
This reverts commit 6b1fd5cfa9.

Reason for revert: broke Settings

Bug: 74950017
Test: revert only
Change-Id: If56a4dcac4671d8e2c5f2c0de30d13e3cf58666a
 2018-03-15 18:48:00 +00:00
Lei Yu
a5a288f873 Merge "Update the restrict app list" into pi-dev 
am: 992444b726

Change-Id: Iefa2af2ed0ede08e484c3ecd02b221d4e8c0c5c3
 2018-03-15 18:39:37 +00:00
Neil Fuller
082dd24a7e Merge "Track changes in libcore" into pi-dev 
am: ea2ef1af44

Change-Id: I9e743ab65f9accccb848b2df99c58f6b636ad604
 2018-03-15 18:36:50 +00:00
Lei Yu
137be5de5b Merge "Add dialog when restrict apps are more than 5" into pi-dev 
am: 34bfe74249

Change-Id: I5ba41a7343c8c274c785429322fe2b1ed4c6aa81
 2018-03-15 18:33:42 +00:00
TreeHugger Robot
4aff464a39 Merge "Update strings for location" into pi-dev 2018-03-15 18:30:24 +00:00
Lei Yu
992444b726 Merge "Update the restrict app list" into pi-dev 2018-03-15 18:28:48 +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
b4c8282929 Merge "Change text for data warning and data limit." into pi-dev 
am: b673aaadc9

Change-Id: Icf0d3cc17abe30946543af85829f9223fc89d921
 2018-03-15 17:18:15 +00:00
Lei Yu
adb61e0828 Merge "Update string in battery app info page" into pi-dev 
am: e5c7317f3f

Change-Id: Ib4ee8e6d0a2470e995dfd9c7d577759cb146ec58
 2018-03-15 17:17:25 +00:00
Lei Yu
99da04933d Update the wifi off string 
When wifi scanning is on.

Bug: 65626601
Test: Manual
Change-Id: Ib4b6ee1cc7f2cc1d8d4ab4d7500579047fd1bfd6
 2018-03-15 10:09:57 -07: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
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
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
f5bbe75951 Merge "Update for 1.0.0-beta1" into pi-dev 
am: 3618f68c01

Change-Id: I66ac7416a3aa3cccbd22ca4b2b934dcfff0a4893
 2018-03-15 13:59:45 +00: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
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