Commit Graph

29903 Commits

Author SHA1 Message Date
Paul Stewart
dab924f04d Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
am: 27c5edb968

Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c
2016-10-28 21:09:38 +00:00
Paul Stewart
27c5edb968 Merge "Don't display an invalid Wi-Fi MAC address"
am: 917b7b863c

Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
2016-10-28 21:04:40 +00:00
Treehugger Robot
917b7b863c Merge "Don't display an invalid Wi-Fi MAC address" 2016-10-28 20:56:35 +00:00
Marie Janssen
6e8a67c008 Merge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours
am: ce2a10b743

Change-Id: If2a0712b38cfd85af1502e68bdda39d1be8735b6
2016-10-28 02:52:12 +00:00
Marie Janssen
ce2a10b743 Merge "Add Bluetooth toggle prompts - settings"
am: de037d5491  -s ours

Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d
2016-10-28 02:45:39 +00:00
Marie Janssen
de037d5491 Merge "Add Bluetooth toggle prompts - settings" 2016-10-27 23:07:31 +00:00
Paul Stewart
1aeb383d73 Don't display an invalid Wi-Fi MAC address
Only display the WifiInfo MAC address if it is a valid address.
Otherwise, display "Unavailable".  The underlying WifiInfo class
now has a default value, and a method that can be used to test
whether or not the contained address is valid.  This change uses
this test and avoids having the confusing default address displayed.

Bug: 32478606
Test: Manual: Turn off WiFi and reboot -- make sure "Unavailable"
      is displayed as the Wi-Fi MAC Address as opposed to "02:00:00:00:00:00"

Change-Id: I912804eb65735375e0ca3c4618a6399543f33b57
2016-10-27 13:34:10 -07:00
Svetoslav Ganov
13088cac84 Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit b06766f129)
2016-10-26 13:30:38 -07:00
Doris Ling
12ffd7aaa7 Ensure that the gesture animation video is paused properly. am: 4245ad4771
am: 5e4fce04fb

Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12
2016-10-21 23:46:51 +00:00
Doris Ling
5e4fce04fb Ensure that the gesture animation video is paused properly.
am: 4245ad4771

Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444
2016-10-21 23:44:19 +00:00
Doris Ling
4245ad4771 Ensure that the gesture animation video is paused properly.
Add the handling to pause the animation video when user navigates away
from the gesture settings.

Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix: 32064123

Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17
2016-10-21 14:28:54 -07:00
Matthew Fritze
1f8073efb9 Merge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c
am: 2da1ca120f

Change-Id: Ic447e8fbf664140f2580c4898e2a0b6618585543
2016-10-21 16:46:00 +00:00
Matthew Fritze
86c8b2a1a5 Support tile title text line wraps am: 0f813d668d
am: 0e0e6c5544

Change-Id: I81fa4356f76b2693eca95ff5c79c6168a68ffd64
2016-10-21 16:45:40 +00:00
Matthew Fritze
2da1ca120f Merge "Support tile title text line wraps" into nyc-mr1-dev
am: f5cd60372c

Change-Id: Ie0d699bcc355519060df04b46b213ce368e47e6a
2016-10-21 16:36:20 +00:00
Matthew Fritze
0e0e6c5544 Support tile title text line wraps
am: 0f813d668d

Change-Id: I47a4f7f95f0bce43a55e661209d48142f82e5b42
2016-10-21 16:36:19 +00:00
TreeHugger Robot
f5cd60372c Merge "Support tile title text line wraps" into nyc-mr1-dev 2016-10-21 16:30:50 +00:00
Matthew Fritze
0f813d668d Support tile title text line wraps
Change-Id: Ice430d03877618aacad21e5ee6167516f60f02fd
Fixes: 32239411
Test: Manual
2016-10-20 17:50:11 -07:00
Fan Zhang
b04bd44378 Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am: 08254e5b4f
am: 723fbd06a9

Change-Id: Ief7d0f6e9d90c34f8b9405d4d13c4080f669c15c
2016-10-20 20:34:04 +00:00
Fan Zhang
dd387b6739 Fix help & feedback link in data usage summary screen. am: 9b52836251
am: 7568e120cf

Change-Id: If7768bdf34204ca158dcf7e2078826a0aabc2ec7
2016-10-20 20:33:51 +00:00
Fan Zhang
723fbd06a9 Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
am: 08254e5b4f

Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6
2016-10-20 20:25:38 +00:00
Fan Zhang
7568e120cf Fix help & feedback link in data usage summary screen.
am: 9b52836251

Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674
2016-10-20 20:25:37 +00:00
TreeHugger Robot
08254e5b4f Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev 2016-10-20 20:18:44 +00:00
Bill Yi
871fd84ab3 Import translations. DO NOT MERGE am: 4bfccb32a7 -s ours am: 4559d2bfac -s ours
am: d0c5d246c8  -s ours

Change-Id: Ic8230d57c512c2ccbc54be5061caac490bcbe6d4
2016-10-20 16:41:12 +00:00
Bill Yi
d0c5d246c8 Import translations. DO NOT MERGE am: 4bfccb32a7 -s ours
am: 4559d2bfac  -s ours

Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d
2016-10-20 16:33:20 +00:00
Bill Yi
4559d2bfac Import translations. DO NOT MERGE
am: 4bfccb32a7  -s ours

Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c
2016-10-20 16:25:35 +00:00
Bill Yi
e41b0705ee Import translations. DO NOT MERGE am: 7e6e9220da -s ours
am: d5bc80036b  -s ours

Change-Id: I147e0e6546f7d367ff81d45bc66e7829bcf45267
2016-10-20 16:25:23 +00:00
Bill Yi
d5bc80036b Import translations. DO NOT MERGE
am: 7e6e9220da  -s ours

Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748
2016-10-20 16:17:21 +00:00
Fan Zhang
9b52836251 Fix help & feedback link in data usage summary screen.
The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.

Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes: 32291069
Test: manual
2016-10-20 09:13:36 -07:00
Bill Yi
4bfccb32a7 Import translations. DO NOT MERGE
Change-Id: I2490d08d85215767e05bf193c3e352c3ab7a7ce9
Auto-generated-cl: translation import
2016-10-20 07:52:52 -07:00
Bill Yi
7e6e9220da Import translations. DO NOT MERGE
Change-Id: I60964278429db5003b317b04e53324fc312116d5
Auto-generated-cl: translation import
2016-10-20 07:48:07 -07:00
Anna Galusza
d3bb66c47a Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am: ee502d5037
am: b104675957

Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9
2016-10-20 03:46:56 +00:00
Anna Galusza
0f2799799c Fix insufficint contrast on Vision Settings toggles. am: e212817785
am: 5bf1f668ff

Change-Id: I0ac8ad8d8cd0091224c2bf1a76ac4845b4c6cf31
2016-10-20 03:46:42 +00:00
Anna Galusza
b104675957 Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
am: ee502d5037

Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5
2016-10-20 03:38:11 +00:00
Anna Galusza
5bf1f668ff Fix insufficint contrast on Vision Settings toggles.
am: e212817785

Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
2016-10-20 03:38:11 +00:00
Anna Galusza
ee502d5037 Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev 2016-10-20 03:32:22 +00:00
Anna Galusza
e212817785 Fix insufficint contrast on Vision Settings toggles.
Bug: 29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
2016-10-19 15:41:00 -07:00
Adrian Roos
3ba7aab582 Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
am: f33b98b750

Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd
2016-10-18 22:43:36 +00:00
Adrian Roos
c0dfa153f4 Separate ambient display triggers am: 82829ee0b1
am: 5ba2074e31

Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c
2016-10-18 22:19:52 +00:00
Adrian Roos
f33b98b750 Merge "Separate ambient display triggers" into nyc-mr1-dev
am: ee5eef1492

Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
2016-10-18 22:16:39 +00:00
Adrian Roos
5ba2074e31 Separate ambient display triggers
am: 82829ee0b1

Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
2016-10-18 22:07:11 +00:00
Adrian Roos
ee5eef1492 Merge "Separate ambient display triggers" into nyc-mr1-dev 2016-10-18 22:00:08 +00:00
Lei Yu
f8866e2bfa Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am: 7fee46383f
am: b4969f5b6f

Change-Id: I81cf5f1bef06b9e3307df38d2e9e942f4be5f1e7
2016-10-18 17:09:29 +00:00
jackqdyulei
ac49ccedb7 Suspend action in security patch when browser is disabled am: 013da34209
am: 221b9157b4

Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4
2016-10-18 17:09:15 +00:00
Lei Yu
b4969f5b6f Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
am: 7fee46383f

Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
2016-10-18 16:54:04 +00:00
jackqdyulei
221b9157b4 Suspend action in security patch when browser is disabled
am: 013da34209

Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
2016-10-18 16:54:03 +00:00
Lei Yu
7fee46383f Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev 2016-10-18 16:45:35 +00:00
Bill Yi
79a4b3160d Import translations. DO NOT MERGE am: 6515783df6 -s ours am: 37c5dd0fe3 -s ours
am: a95e430c93  -s ours

Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23
2016-10-18 05:49:41 +00:00
Bill Yi
cda385e996 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b -s ours
am: 987866df87  -s ours

Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf
2016-10-18 05:49:22 +00:00
Bill Yi
3e664455dc Import translations. DO NOT MERGE am: ccde0787b8 -s ours
am: 4367ed325e  -s ours

Change-Id: I10c8b1a9a393fa87343ebc2802232f246357b9b8
2016-10-18 05:49:02 +00:00
Bill Yi
a95e430c93 Import translations. DO NOT MERGE am: 6515783df6 -s ours
am: 37c5dd0fe3  -s ours

Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
2016-10-18 05:40:29 +00:00