jdesprez
57b9e15574
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev am: a2da6221c0
...
am: 42e58da882
Change-Id: I7e6eafdc273f656120739c301564554759abf301
2018-03-20 07:55:16 +00:00
Lei Yu
ccba53cb0b
Merge "update "Last full charge" preference" into pi-dev am: de0a3a5334
...
am: 549d4bd297
Change-Id: Ie2a55082d3a7916b5eec4499518f2675c92afce2
2018-03-20 07:44:49 +00:00
xshu
da432d904a
Updating special Settings Wi-Fi strings am: e0a6d1640a
...
am: ba2acc4ba0
Change-Id: Ica95727f87e7bc4d310f6daf52927b6b749bf313
2018-03-20 07:32:49 +00:00
Hall Liu
e3b9578658
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev am: 8837f992bb
...
am: 0738a917df
Change-Id: I5ee44871c48d6052b1d62f4cbd8dd1ed76bd74e6
2018-03-20 07:12:38 +00:00
Lei Yu
306f7312f4
Merge "Update the mechanism to upload new anomaly config" into pi-dev am: d06991821f
...
am: f31a7c546d
Change-Id: I6e6f5492a7fafedd74e88a51ef977ccab1e78f5d
2018-03-20 05:58:53 +00:00
Phil Weaver
03f49cf863
Merge "Update string for dwell click timing" into pi-dev am: c10659cee7
...
am: 5f6dd9b4f2
Change-Id: Ied2a98e49ccb06b8196ded44b081f6768d09d743
2018-03-20 05:22:49 +00:00
jdesprez
42e58da882
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
...
am: a2da6221c0
Change-Id: I59ed1b0b9bc8ee262f9bc1602ab03773e9f71026
2018-03-20 04:54:41 +00:00
Lei Yu
549d4bd297
Merge "update "Last full charge" preference" into pi-dev
...
am: de0a3a5334
Change-Id: I8b7ef49bc738f88cf36d31208e5370a292eb23b5
2018-03-20 02:57:55 +00:00
xshu
ba2acc4ba0
Updating special Settings Wi-Fi strings
...
am: e0a6d1640a
Change-Id: Ic9c587ed88b22d16f8f6ca1dca61bdcccf4214ff
2018-03-20 02:35:02 +00:00
TreeHugger Robot
a2da6221c0
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
2018-03-20 02:13:47 +00:00
Lei Yu
de0a3a5334
Merge "update "Last full charge" preference" into pi-dev
2018-03-20 00:33:29 +00:00
TreeHugger Robot
43adc4448c
Merge "Revert "Disable R8 for Settings""
2018-03-20 00:20:46 +00:00
Hall Liu
0738a917df
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
...
am: 8837f992bb
Change-Id: I41aec9f11b1e34cd56681b171a587bddb539f54e
2018-03-20 00:16:45 +00:00
xshu
e0a6d1640a
Updating special Settings Wi-Fi strings
...
Bug: 74356729
Test: compile
Manually inspected the affected UI pages
Change-Id: I6905dce8f3d6c4acbddedccbf0401b9ef6bba53b
2018-03-19 17:09:16 -07:00
Lei Yu
f31a7c546d
Merge "Update the mechanism to upload new anomaly config" into pi-dev
...
am: d06991821f
Change-Id: Icdeb6c116a320fdfc661c2ce27b01a6f8f806f17
2018-03-19 23:47:10 +00:00
Phil Weaver
5f6dd9b4f2
Merge "Update string for dwell click timing" into pi-dev
...
am: c10659cee7
Change-Id: I242b3787680ffa75dfc6294ae4c6d893025d37fc
2018-03-19 23:37:03 +00:00
jdesprez
881004ca26
Update AndroidTest.xml to be APCT suite ready
...
Test: atest SettingsUITests
Bug: 74440293
Change-Id: Id7940589a5cd216668ab4664bb802faaf70b5f68
2018-03-19 14:46:45 -07:00
Doris Ling
f38d78bf09
Revert "Disable R8 for Settings"
...
This reverts commit f416cf775e
.
Revert reason: this change is breaking Settings app presubmit test
Bug: 74834445
Change-Id: Ibfc1b8003ccb4044ded2a8d5661fb45bf3d090f5
2018-03-19 21:44:49 +00:00
Hall Liu
8837f992bb
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
2018-03-19 21:15:26 +00:00
Lei Yu
d06991821f
Merge "Update the mechanism to upload new anomaly config" into pi-dev
2018-03-19 20:20:15 +00:00
Lei Yu
8b148924de
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
2018-03-19 13:18:27 -07:00
Lei Yu
cd38d0e16a
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev am: dcf7b68920
...
am: 7f14fa4f7d
Change-Id: Ic84a9db8e3df9f11d2961a4ff9932c11d4cbfe69
2018-03-19 20:06:31 +00:00
Phil Weaver
c10659cee7
Merge "Update string for dwell click timing" into pi-dev
2018-03-19 19:58:02 +00:00
Jong Wook Kim
056aea7eff
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev am: 8a022d8693
...
am: 3520bfc36d
Change-Id: I153088f7ee8f7284b9c8b3122e449b24bf71a96f
2018-03-19 19:39:22 +00:00
Lei Yu
7f14fa4f7d
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev
...
am: dcf7b68920
Change-Id: I0bdf645ed8a067dff853b063ff99b1013d85830b
2018-03-19 19:34:51 +00:00
Jan Nordqvist
49b2ad914d
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev am: 9e1226e431
...
am: 085b9e6f83
Change-Id: Iff0a9324f91cbdd73e4ef336e63c013278000376
2018-03-19 19:29:16 +00:00
Jong Wook Kim
3520bfc36d
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
...
am: 8a022d8693
Change-Id: Id2c0523182ccbfb629f9a296bb8b6117651f2b4e
2018-03-19 19:15:17 +00:00
Jan Nordqvist
085b9e6f83
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
...
am: 9e1226e431
Change-Id: I5fd67fc34ed244178b6c6a9919761ceaa6087239
2018-03-19 19:06:11 +00:00
Lei Yu
dcf7b68920
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev
2018-03-19 18:45:08 +00:00
Jong Wook Kim
8a022d8693
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
2018-03-19 18:14:08 +00:00
Jan Nordqvist
9e1226e431
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
2018-03-19 18:05:44 +00:00
Bill Yi
6acfce9e80
Merge "Import translations. DO NOT MERGE" into pi-dev am: 8aff2f8fe7
-s ours
...
am: 175a8c8626
-s ours
Change-Id: Ie3190ec74558a27feab05ec757b739e84b2599c2
2018-03-19 17:58:07 +00:00
Bill Yi
175a8c8626
Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 8aff2f8fe7
-s ours
Change-Id: I63ed30b348c6c5858a2b4153f6d24ebeb2e5e047
2018-03-19 17:47:02 +00:00
TreeHugger Robot
8aff2f8fe7
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-19 17:07:14 +00:00
Jan Nordqvist
6e6c8bee6e
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
2018-03-19 16:29:30 +00:00
Jan Nordqvist
e220966de1
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
...
am: 44e5941757
Change-Id: If3957fd7264882e71c73163e9931bea24da5a466
2018-03-19 16:15:50 +00:00
Jan Nordqvist
44e5941757
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
2018-03-19 16:04:23 +00:00
Andreas Terzis
4bad644838
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev am: 895f785470
...
am: e5468d5ce0
Change-Id: I65f4fb7036ed81f26022ebb18e342ba278b5d7a9
2018-03-19 14:42:12 +00:00
Andreas Terzis
e5468d5ce0
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
...
am: 895f785470
Change-Id: Ib3f59b7c930f909e80e2f61dd4c3f54ffda5821a
2018-03-19 14:30:08 +00:00
Andreas Terzis
895f785470
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
2018-03-19 14:22:51 +00:00
Bill Yi
5b57d1d1cb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6421ebc38133f014551740dd9974dbb687a13b2d
2018-03-19 07:17:36 -07:00
Jong Wook Kim
091894d09d
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
2018-03-18 21:55:09 +00:00
Julia Reynolds
fefa6653b4
Merge "Add placeholder on DND settings screen" into pi-dev am: b0f251597c
...
am: 37f00d489a
Change-Id: I1b6a4e662300fb3401eea86aca88789a1bc31f62
2018-03-17 14:58:00 +00:00
Julia Reynolds
37f00d489a
Merge "Add placeholder on DND settings screen" into pi-dev
...
am: b0f251597c
Change-Id: Ia8394bc0b16365ddf9f312810f251769093b7015
2018-03-17 14:35:15 +00:00
Julia Reynolds
b0f251597c
Merge "Add placeholder on DND settings screen" into pi-dev
2018-03-17 14:28:41 +00:00
Lei Yu
301a89d726
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
2018-03-16 18:19:17 -07:00
Bill Yi
54f6b59e20
Merge "Import translations. DO NOT MERGE" into pi-dev am: 77d1ca7030
-s ours
...
am: 152a850c30
-s ours
Change-Id: Ifafa4d69eabfa4e38faf768d6e9051dc1d0baa90
2018-03-17 00:43:38 +00:00
Bill Yi
152a850c30
Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 77d1ca7030
-s ours
Change-Id: I28549cd7cc5ee5a38037a63a10c5351e899589a6
2018-03-16 23:59:16 +00:00
Phil Weaver
e530e2634d
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
2018-03-16 16:34:22 -07:00
Jan Nordqvist
c7faabf408
Add the string "No time remaining" when remaining time <= 0.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Id8ff1dde78f3389b5ab15120a2460ab19e895c6f
2018-03-16 16:32:00 -07:00