OSDN Git Service
Maurice Lam [Tue, 20 Mar 2018 08:07:54 +0000 (08:07 +0000)]
Merge "Make "minimal" pattern layout sw320dp" into pi-dev am:
b98eea4c67
am:
f7c9fbea5e
Change-Id: Ic0991d908971f8dc62f0f21c8d5e509c95de3ff0
Fan Zhang [Tue, 20 Mar 2018 08:06:26 +0000 (08:06 +0000)]
Merge "Update switch bar summary for spell checker page" into pi-dev am:
39b54ea1f8
am:
e147c48470
Change-Id: I0c7473f61ac3a783f8a1559fc88396e73c3f35e9
HJ ChangLiao [Tue, 20 Mar 2018 08:04:11 +0000 (08:04 +0000)]
Merge "Remove ops preference from specific app" into pi-dev am:
ac20e2d511
am:
cbd6c33774
Change-Id: I1eac43a72e96820091f320711c4dd0c162612832
jdesprez [Tue, 20 Mar 2018 07:55:16 +0000 (07:55 +0000)]
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev am:
a2da6221c0
am:
42e58da882
Change-Id: I7e6eafdc273f656120739c301564554759abf301
Lei Yu [Tue, 20 Mar 2018 07:44:49 +0000 (07:44 +0000)]
Merge "update "Last full charge" preference" into pi-dev am:
de0a3a5334
am:
549d4bd297
Change-Id: Ie2a55082d3a7916b5eec4499518f2675c92afce2
xshu [Tue, 20 Mar 2018 07:32:49 +0000 (07:32 +0000)]
Updating special Settings Wi-Fi strings am:
e0a6d1640a
am:
ba2acc4ba0
Change-Id: Ica95727f87e7bc4d310f6daf52927b6b749bf313
Hall Liu [Tue, 20 Mar 2018 07:12:38 +0000 (07:12 +0000)]
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev am:
8837f992bb
am:
0738a917df
Change-Id: I5ee44871c48d6052b1d62f4cbd8dd1ed76bd74e6
Lei Yu [Tue, 20 Mar 2018 05:58:53 +0000 (05:58 +0000)]
Merge "Update the mechanism to upload new anomaly config" into pi-dev am:
d06991821f
am:
f31a7c546d
Change-Id: I6e6f5492a7fafedd74e88a51ef977ccab1e78f5d
Phil Weaver [Tue, 20 Mar 2018 05:22:49 +0000 (05:22 +0000)]
Merge "Update string for dwell click timing" into pi-dev am:
c10659cee7
am:
5f6dd9b4f2
Change-Id: Ied2a98e49ccb06b8196ded44b081f6768d09d743
Maurice Lam [Tue, 20 Mar 2018 05:20:05 +0000 (05:20 +0000)]
Merge "Make "minimal" pattern layout sw320dp" into pi-dev
am:
b98eea4c67
Change-Id: I54ae0434ed07e0bb2842317d91cc6c8b5af8406b
Fan Zhang [Tue, 20 Mar 2018 05:19:17 +0000 (05:19 +0000)]
Merge "Update switch bar summary for spell checker page" into pi-dev
am:
39b54ea1f8
Change-Id: I66bcfd8f0bf5ddcebeca14cb5c1103278ff3a97f
HJ ChangLiao [Tue, 20 Mar 2018 05:17:57 +0000 (05:17 +0000)]
Merge "Remove ops preference from specific app" into pi-dev
am:
ac20e2d511
Change-Id: I0eb1403ecaaed7d2cfa932a0228e707653623a16
jdesprez [Tue, 20 Mar 2018 04:54:41 +0000 (04:54 +0000)]
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
am:
a2da6221c0
Change-Id: I59ed1b0b9bc8ee262f9bc1602ab03773e9f71026
TreeHugger Robot [Tue, 20 Mar 2018 03:30:42 +0000 (03:30 +0000)]
Merge "Make "minimal" pattern layout sw320dp" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 02:58:38 +0000 (02:58 +0000)]
Merge "Update switch bar summary for spell checker page" into pi-dev
Lei Yu [Tue, 20 Mar 2018 02:57:55 +0000 (02:57 +0000)]
Merge "update "Last full charge" preference" into pi-dev
am:
de0a3a5334
Change-Id: I8b7ef49bc738f88cf36d31208e5370a292eb23b5
TreeHugger Robot [Tue, 20 Mar 2018 02:35:21 +0000 (02:35 +0000)]
Merge "Remove ops preference from specific app" into pi-dev
xshu [Tue, 20 Mar 2018 02:35:02 +0000 (02:35 +0000)]
Updating special Settings Wi-Fi strings
am:
e0a6d1640a
Change-Id: Ic9c587ed88b22d16f8f6ca1dca61bdcccf4214ff
TreeHugger Robot [Tue, 20 Mar 2018 02:13:47 +0000 (02:13 +0000)]
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
Fan Zhang [Mon, 19 Mar 2018 22:58:48 +0000 (15:58 -0700)]
Update switch bar summary for spell checker page
Change-Id: If48ad81e5ad5e4a7bd65ede5ed67d28250fbe8ed
Fixes:
75277295
Test: atest SpellCheckerSettingsUITest
Lei Yu [Tue, 20 Mar 2018 00:33:29 +0000 (00:33 +0000)]
Merge "update "Last full charge" preference" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 00:20:46 +0000 (00:20 +0000)]
Merge "Revert "Disable R8 for Settings""
Hall Liu [Tue, 20 Mar 2018 00:16:45 +0000 (00:16 +0000)]
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
am:
8837f992bb
Change-Id: I41aec9f11b1e34cd56681b171a587bddb539f54e
xshu [Fri, 16 Mar 2018 18:41:24 +0000 (11:41 -0700)]
Updating special Settings Wi-Fi strings
Bug:
74356729
Test: compile
Manually inspected the affected UI pages
Change-Id: I6905dce8f3d6c4acbddedccbf0401b9ef6bba53b
Lei Yu [Mon, 19 Mar 2018 23:47:10 +0000 (23:47 +0000)]
Merge "Update the mechanism to upload new anomaly config" into pi-dev
am:
d06991821f
Change-Id: Icdeb6c116a320fdfc661c2ce27b01a6f8f806f17
Phil Weaver [Mon, 19 Mar 2018 23:37:03 +0000 (23:37 +0000)]
Merge "Update string for dwell click timing" into pi-dev
am:
c10659cee7
Change-Id: I242b3787680ffa75dfc6294ae4c6d893025d37fc
jdesprez [Mon, 19 Mar 2018 21:46:45 +0000 (14:46 -0700)]
Update AndroidTest.xml to be APCT suite ready
Test: atest SettingsUITests
Bug:
74440293
Change-Id: Id7940589a5cd216668ab4664bb802faaf70b5f68
Doris Ling [Mon, 19 Mar 2018 21:44:49 +0000 (21:44 +0000)]
Revert "Disable R8 for Settings"
This reverts commit
f416cf775e5adf76c4f45f1471b7a25e9aeae906.
Revert reason: this change is breaking Settings app presubmit test
Bug:
74834445
Change-Id: Ibfc1b8003ccb4044ded2a8d5661fb45bf3d090f5
Hall Liu [Mon, 19 Mar 2018 21:15:26 +0000 (21:15 +0000)]
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
Lei Yu [Mon, 19 Mar 2018 20:20:15 +0000 (20:20 +0000)]
Merge "Update the mechanism to upload new anomaly config" into pi-dev
Lei Yu [Fri, 16 Mar 2018 22:26:33 +0000 (15:26 -0700)]
update "Last full charge" preference
When there is average time estimation, change it to "Full charge lasts
about" and also update the time.
Also update the BatteryInfo to return average time estimation even
though it is charging.
Bug:
73018395
Test: RunSettingsRoboTests
Change-Id: Ib22dadb5716e3034c60aeeb7768fdbf0cc86be0c
Lei Yu [Mon, 19 Mar 2018 20:06:31 +0000 (20:06 +0000)]
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev am:
dcf7b68920
am:
7f14fa4f7d
Change-Id: Ic84a9db8e3df9f11d2961a4ff9932c11d4cbfe69
Phil Weaver [Mon, 19 Mar 2018 19:58:02 +0000 (19:58 +0000)]
Merge "Update string for dwell click timing" into pi-dev
Jong Wook Kim [Mon, 19 Mar 2018 19:39:22 +0000 (19:39 +0000)]
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev am:
8a022d8693
am:
3520bfc36d
Change-Id: I153088f7ee8f7284b9c8b3122e449b24bf71a96f
Lei Yu [Mon, 19 Mar 2018 19:34:51 +0000 (19:34 +0000)]
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev
am:
dcf7b68920
Change-Id: I0bdf645ed8a067dff853b063ff99b1013d85830b
Jan Nordqvist [Mon, 19 Mar 2018 19:29:16 +0000 (19:29 +0000)]
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev am:
9e1226e431
am:
085b9e6f83
Change-Id: Iff0a9324f91cbdd73e4ef336e63c013278000376
Jong Wook Kim [Mon, 19 Mar 2018 19:15:17 +0000 (19:15 +0000)]
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
am:
8a022d8693
Change-Id: Id2c0523182ccbfb629f9a296bb8b6117651f2b4e
Jan Nordqvist [Mon, 19 Mar 2018 19:06:11 +0000 (19:06 +0000)]
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
am:
9e1226e431
Change-Id: I5fd67fc34ed244178b6c6a9919761ceaa6087239
Lei Yu [Mon, 19 Mar 2018 18:45:08 +0000 (18:45 +0000)]
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev
Maurice Lam [Fri, 16 Mar 2018 23:26:42 +0000 (16:26 -0700)]
Make "minimal" pattern layout sw320dp
The minimal layout was sw400dp, but some smaller phones still have
enough space to display the icon and button decently, so we're
reducing the trigger threshold for the "minimal" layout to sw320dp.
Test: m -j RunSettingsRoboTests
Bug:
74527018
Change-Id: Ibfca1828870058301cca302554ce3d932c8ba70b
Jong Wook Kim [Mon, 19 Mar 2018 18:14:08 +0000 (18:14 +0000)]
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
Jan Nordqvist [Mon, 19 Mar 2018 18:05:44 +0000 (18:05 +0000)]
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
Bill Yi [Mon, 19 Mar 2018 17:58:07 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev am:
8aff2f8fe7 -s ours
am:
175a8c8626 -s ours
Change-Id: Ie3190ec74558a27feab05ec757b739e84b2599c2
Bill Yi [Mon, 19 Mar 2018 17:47:02 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
8aff2f8fe7 -s ours
Change-Id: I63ed30b348c6c5858a2b4153f6d24ebeb2e5e047
TreeHugger Robot [Mon, 19 Mar 2018 17:07:14 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jan Nordqvist [Mon, 19 Mar 2018 16:29:30 +0000 (16:29 +0000)]
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev am:
44e5941757
am:
e220966de1
Change-Id: I5caaab55a05d16bd709861c3d269e7712b32e96b
Jan Nordqvist [Mon, 19 Mar 2018 16:15:50 +0000 (16:15 +0000)]
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
am:
44e5941757
Change-Id: If3957fd7264882e71c73163e9931bea24da5a466
Jan Nordqvist [Mon, 19 Mar 2018 16:04:23 +0000 (16:04 +0000)]
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
Andreas Terzis [Mon, 19 Mar 2018 14:42:12 +0000 (14:42 +0000)]
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev am:
895f785470
am:
e5468d5ce0
Change-Id: I65f4fb7036ed81f26022ebb18e342ba278b5d7a9
Andreas Terzis [Mon, 19 Mar 2018 14:30:08 +0000 (14:30 +0000)]
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
am:
895f785470
Change-Id: Ib3f59b7c930f909e80e2f61dd4c3f54ffda5821a
Andreas Terzis [Mon, 19 Mar 2018 14:22:51 +0000 (14:22 +0000)]
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
Bill Yi [Mon, 19 Mar 2018 14:17:36 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6421ebc38133f014551740dd9974dbb687a13b2d
Jong Wook Kim [Wed, 14 Mar 2018 07:56:20 +0000 (00:56 -0700)]
Display "MAC address is randomized" in Wifi Preference Page
When Connected MAC Randomization is enabled and the device is
disconnected, there isn't a valid MAC address to display since we don't
know what the device's next MAC address is going to be.
Instead of displaying the MAC address used for previous connection, tell
users that "MAC address is randomized."
Bug:
73663275
Test: make -j40 RunSettingsRoboTests
Change-Id: Id5352926f221e3215734d1c198f2072940f82695
Julia Reynolds [Sat, 17 Mar 2018 14:58:00 +0000 (14:58 +0000)]
Merge "Add placeholder on DND settings screen" into pi-dev am:
b0f251597c
am:
37f00d489a
Change-Id: I1b6a4e662300fb3401eea86aca88789a1bc31f62
Julia Reynolds [Sat, 17 Mar 2018 14:35:15 +0000 (14:35 +0000)]
Merge "Add placeholder on DND settings screen" into pi-dev
am:
b0f251597c
Change-Id: Ia8394bc0b16365ddf9f312810f251769093b7015
Julia Reynolds [Sat, 17 Mar 2018 14:28:41 +0000 (14:28 +0000)]
Merge "Add placeholder on DND settings screen" into pi-dev
Lei Yu [Sat, 17 Mar 2018 01:19:17 +0000 (18:19 -0700)]
Remove dupe key in UniquePreferenceTest
The duplicate page already removed in b/
70848054, we need to update
the test.
Change-Id: Ia1f313d211e7528311e56596dbab152aad54bf22
Fixes:
70848054
Test: runtest -x UniquePreferenceTest
Bill Yi [Sat, 17 Mar 2018 00:43:38 +0000 (00:43 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev am:
77d1ca7030 -s ours
am:
152a850c30 -s ours
Change-Id: Ifafa4d69eabfa4e38faf768d6e9051dc1d0baa90
Bill Yi [Fri, 16 Mar 2018 23:59:16 +0000 (23:59 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
77d1ca7030 -s ours
Change-Id: I28549cd7cc5ee5a38037a63a10c5351e899589a6
Phil Weaver [Mon, 12 Mar 2018 20:48:48 +0000 (13:48 -0700)]
Update string for dwell click timing
Also adding a footer to the preference.
Change-Id: If34cf34ecec29918a1def0c924f4fe1dc378918c
Fixes:
71869029
Test: Make, navigate and observe glorious new string
Jan Nordqvist [Fri, 16 Mar 2018 23:14:28 +0000 (16:14 -0700)]
Add the string "No time remaining" when remaining time <= 0.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Id8ff1dde78f3389b5ab15120a2460ab19e895c6f
Jerry Zhang [Fri, 16 Mar 2018 23:25:10 +0000 (23:25 +0000)]
Merge "Update USB settings screen" into pi-dev am:
d85ef28585
am:
00bf936304
Change-Id: Ic6359ec20c413812d0492497a2c8b07a00b95f03
TreeHugger Robot [Fri, 16 Mar 2018 23:19:48 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jerry Zhang [Fri, 16 Mar 2018 23:12:29 +0000 (23:12 +0000)]
Merge "Update USB settings screen" into pi-dev
am:
d85ef28585
Change-Id: I2eeb0b2e585fd958be20f5831bee4257b1838c92
Hall Liu [Wed, 14 Mar 2018 01:28:58 +0000 (18:28 -0700)]
Split "Mobile Network Type" indication in Settings
Display data and voice network type for clarity
Change-Id: I26e52dcc564dfd96e36e45d94d6e69225ea4a80f
Fixes:
70938010
Test: manual, unit
Jerry Zhang [Fri, 16 Mar 2018 22:40:38 +0000 (22:40 +0000)]
Merge "Update USB settings screen" into pi-dev
Lei Yu [Fri, 16 Mar 2018 22:12:08 +0000 (22:12 +0000)]
Merge "Update the wifi off string" into pi-dev am:
ef0278ae3c
am:
559377618b
Change-Id: I5be477d03841c4d44efce0208e2f65508481a61e
Lei Yu [Fri, 16 Mar 2018 21:47:03 +0000 (21:47 +0000)]
Merge "Update the wifi off string" into pi-dev
am:
ef0278ae3c
Change-Id: I5e01bef3499120ad709834cff1afa4f4dc956dc6
Jan Nordqvist [Mon, 12 Mar 2018 23:23:13 +0000 (16:23 -0700)]
In Network & internet screen, hide summary under Data usage when there is No SIM
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I4abd401aa9420b2b0090fac76991fe5067acc2e9
Lei Yu [Fri, 16 Mar 2018 21:28:43 +0000 (21:28 +0000)]
Merge "Update the wifi off string" into pi-dev
Jan Nordqvist [Fri, 16 Mar 2018 17:19:04 +0000 (10:19 -0700)]
In Data Usage screen, Above the data bar, Change font size of number.
This is related to ag/
3746508 and sets the size of the "small" text to 16sp.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I17f859186dc596c4dbab190241325bac4dad5554
Julia Reynolds [Fri, 16 Mar 2018 20:32:40 +0000 (20:32 +0000)]
Merge "Link to dnd settings from notification settings" into pi-dev am:
5d419a2dcf
am:
c34fe741d1
Change-Id: I6b63ce4c08a648745f471fc6e39f0d79469e0cc1
Bill Yi [Fri, 16 Mar 2018 20:20:09 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If94e8adc7ea1d0106ebb553314d47f4311ffbd0e
Julia Reynolds [Fri, 16 Mar 2018 20:00:44 +0000 (20:00 +0000)]
Merge "Link to dnd settings from notification settings" into pi-dev
am:
5d419a2dcf
Change-Id: I9c70fdc2b327e095a75edc0bd6720e671e8f1436
Julia Reynolds [Fri, 16 Mar 2018 19:43:38 +0000 (19:43 +0000)]
Merge "Link to dnd settings from notification settings" into pi-dev
Lei Yu [Fri, 16 Mar 2018 19:13:22 +0000 (19:13 +0000)]
Merge "update strings in battery settings(Round 1)" into pi-dev am:
cf0cae785f
am:
dd4a47f940
Change-Id: I4b733b279865ece8c64b0536a8ae6000a6d98752
Lei Yu [Fri, 16 Mar 2018 18:53:53 +0000 (18:53 +0000)]
Merge "update strings in battery settings(Round 1)" into pi-dev
am:
cf0cae785f
Change-Id: I5a31629dadc6a6119327dc3ba87890670788ce2f
Lei Yu [Fri, 16 Mar 2018 18:26:49 +0000 (18:26 +0000)]
Merge "update strings in battery settings(Round 1)" into pi-dev
Lei Yu [Thu, 15 Mar 2018 22:55:07 +0000 (15:55 -0700)]
Update the mechanism to upload new anomaly config
1. Move the config update to jobscheduler, so config is checked and
updated every day.
2. Before the update, always delete the old config.
3. Move uploadIntent method to BatteryTipUtils.
Bug:
74997752
Fixes:
74564143
Test: RunSettingsRoboTests
Change-Id: If88759595d57a562b25542082f895fe8f207acdb
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
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
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
Julia Reynolds [Thu, 15 Mar 2018 14:22:01 +0000 (10:22 -0400)]
Link to dnd settings from notification settings
Test: make -j20 RunSettingsRoboTests
Change-Id: Idf70155134b2e78bd410468497cabe8faf1557ce
Fixes:
74319354
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
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
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
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
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
Julia Reynolds [Fri, 16 Mar 2018 15:45:05 +0000 (15:45 +0000)]
Merge "Fix channel screen launching" into pi-dev
Alison Cichowlas [Fri, 16 Mar 2018 15:44:12 +0000 (15:44 +0000)]
Merge "Sort Uncategorized channel to the bottom." into pi-dev
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
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
Adam Newman [Fri, 16 Mar 2018 14:26:25 +0000 (14:26 +0000)]
Merge "Enable launching captive portal directly" into pi-dev
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
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
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
Lei Yu [Tue, 13 Mar 2018 21:19:04 +0000 (14:19 -0700)]
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
Jerry Zhang [Fri, 23 Feb 2018 02:13:06 +0000 (18:13 -0800)]
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
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
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)
OSDN Git Service
