Commit Graph

43488 Commits

Author SHA1 Message Date
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
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
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
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
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
Jerry Zhang
191e31fec9 Merge "Update USB settings screen" into pi-dev am: d85ef28585
am: 00bf936304

Change-Id: Ic6359ec20c413812d0492497a2c8b07a00b95f03
2018-03-16 23:25:10 +00:00
TreeHugger Robot
77d1ca7030 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-16 23:19:48 +00:00
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
07736734ff Merge "Update the wifi off string" into pi-dev am: ef0278ae3c
am: 559377618b

Change-Id: I5be477d03841c4d44efce0208e2f65508481a61e
2018-03-16 22:12:08 +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
Jan Nordqvist
637dc29fe9 In Network & internet screen, hide summary under Data usage when there is No SIM
Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I4abd401aa9420b2b0090fac76991fe5067acc2e9
2018-03-16 14:29:33 -07:00
Lei Yu
ef0278ae3c Merge "Update the wifi off string" into pi-dev 2018-03-16 21:28:43 +00:00
Jan Nordqvist
b104a25dd0 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
2018-03-16 14:26:18 -07:00
Julia Reynolds
f36efcdfd6 Merge "Link to dnd settings from notification settings" into pi-dev am: 5d419a2dcf
am: c34fe741d1

Change-Id: I6b63ce4c08a648745f471fc6e39f0d79469e0cc1
2018-03-16 20:32:40 +00:00
Bill Yi
dbc03e5b02 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If94e8adc7ea1d0106ebb553314d47f4311ffbd0e
2018-03-16 13:20:09 -07: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
0bd76013f2 Merge "update strings in battery settings(Round 1)" into pi-dev am: cf0cae785f
am: dd4a47f940

Change-Id: I4b733b279865ece8c64b0536a8ae6000a6d98752
2018-03-16 19:13:22 +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
87501f8165 Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev am: 6b65ffaab7
am: b1d3e89372

Change-Id: I6c4045aed589dc4f11a70cb8c4475357052ce12b
2018-03-16 17:46:54 +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
bbcc221a87 Merge "Fix channel screen launching" into pi-dev am: a0cb928098
am: cc611845bf

Change-Id: I1ec1459dd06065228957991ce4a04954dcd3c1dd
2018-03-16 16:41:52 +00:00
Alison Cichowlas
b9ef0adf66 Merge "Sort Uncategorized channel to the bottom." into pi-dev am: 97f63ba910
am: 3aaf3bcc52

Change-Id: Ibd106a3ce049eb90263f69878088b91e3e8dc359
2018-03-16 16:23:48 +00: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