Bill Yi
5cca5a64e8
Import translations. DO NOT MERGE am: bb6af9902d
-s ours am: 061b294714
-s ours
...
am: 4666b50754
-s ours
Change-Id: I1aaca58936606507f763770e65dace147da5153a
2016-11-23 23:29:07 +00:00
Bill Yi
57b56329f3
Import translations. DO NOT MERGE am: e7f9b0b30b
-s ours
...
am: f8b4927683
-s ours
Change-Id: I4be07f881fd515c3668c12ecab6d2af8452d1ec0
2016-11-23 23:28:53 +00:00
Steven Ng
26a3c28735
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
...
am: 046a63450f
Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
2016-11-23 23:28:38 +00:00
Bill Yi
71a0bb85a5
Import translations. DO NOT MERGE am: a6d9842695
-s ours am: c027907edc
-s ours
...
am: f8032d0b15
-s ours
Change-Id: I0c7f588a8868df3a7235dbbac1eff725dc591070
2016-11-23 23:28:25 +00:00
Bill Yi
88b043714b
Import translations. DO NOT MERGE am: 475763d01c
-s ours
...
am: 9a22968ff8
-s ours
Change-Id: Ic98ab45a4b2e31007a18e7018ad5f31c2b82d2ae
2016-11-23 23:28:12 +00:00
Bill Yi
d6de02579f
Import translations. DO NOT MERGE am: 001632d55c
-s ours
...
am: 9e17133192
-s ours
Change-Id: Idda03611e22b67dba524f61ac9884de84950d962
2016-11-21 01:33:23 +00:00
Bill Yi
9e17133192
Import translations. DO NOT MERGE
...
am: 001632d55c
-s ours
Change-Id: Ib267ac961a6ef99c9c1401e8967725b0f7914bac
2016-11-21 01:28:26 +00:00
Bill Yi
001632d55c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002
2016-11-20 16:12:14 -08:00
Jerry Zhang
0a098f377c
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d
am: 1451a4af78
...
am: 3473bc219e
Change-Id: I6064f90dcde32ccc5132fd5999224a99c7e378b0
2016-11-17 00:39:37 +00:00
Jerry Zhang
f8ed07fc64
Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
am: a75fa91247
...
am: fd764ac0e3
Change-Id: Iee63263785e80cb1a893dc99204bb2fb225a497a
2016-11-17 00:39:22 +00:00
Jerry Zhang
3473bc219e
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d
...
am: 1451a4af78
Change-Id: I90048a233d80ee023e9f775b540248b62aa5e4ea
2016-11-17 00:24:57 +00:00
Jerry Zhang
fd764ac0e3
Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
...
am: a75fa91247
Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6
2016-11-17 00:24:50 +00:00
Jerry Zhang
1451a4af78
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
...
am: 89a055aa9d
Change-Id: I8bad2864a848b46c99e2693acacb320615338ec8
2016-11-17 00:12:59 +00:00
Jerry Zhang
a75fa91247
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
am: a1b60e629f
Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd
2016-11-17 00:09:38 +00:00
Jerry Zhang
89a055aa9d
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
2016-11-16 23:59:33 +00:00
Sohani Rao
7fd676ee26
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
am: 6f126a8f5c
...
am: 6cebca2599
Change-Id: I8cfaadb7dd8df6d81695dea8530a25de69fcce3d
2016-11-14 21:28:16 +00:00
Sohani Rao
6cebca2599
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
...
am: 6f126a8f5c
Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c
2016-11-14 21:21:49 +00:00
Sohani Rao
6f126a8f5c
Merge "Add WiFi toggle prompts - settings"
...
am: b4b2c2aa43
Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a
2016-11-14 21:14:54 +00:00
Sohani Rao
b4b2c2aa43
Merge "Add WiFi toggle prompts - settings"
2016-11-14 20:59:36 +00:00
Bill Yi
c68492d994
Import translations. DO NOT MERGE
...
am: d13efff7aa
-s ours
Change-Id: I03a2044f78ee22bc152cabc2a3c338aacd9f37fe
2016-11-14 19:44:02 +00:00
Svetoslav Ganov
e06767af78
Add WiFi toggle prompts - settings
...
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug: 28715749
Test: Unit tests
Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Merged-In: I10d1231ea0c47eec5993dbe367cc0c245cba9385
2016-11-14 10:32:39 -08:00
Bill Yi
d13efff7aa
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32839141
Change-Id: I6145b97714693ec78cbc8b7d2235ed5830e7f714
2016-11-14 09:50:59 -08:00
xiaocheng.x.wang
7602e88504
Fix apn can't be updated when pressing back key
...
APN can't be updated because onkey() method is not invoked when user presses
the virtual back key. The ApnEditor was changed from Activity to Fragment
in Android N. A fragment can't receive onKey() event without calling
setFocusableInTouchMode(true).
Test: manual - updated apn setting, then pressed back
Bug: 32815214
Change-Id: I7824e84bd617d2057a61f4198fa7fd50f123bc8e
2016-11-11 12:48:57 +09:00
Bill Yi
d8bd462f71
Import translations. DO NOT MERGE
...
am: 416fa38e75
-s ours
Change-Id: Idfc5c51e90e9ccfb84256f532250ca5cfdf2a0a1
2016-11-05 06:44:39 +00:00
Bill Yi
416fa38e75
Import translations. DO NOT MERGE
...
Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import
2016-11-04 22:19:32 -07:00
Stephen Chen
4ba959c7c4
Add subtypes to tron logging for Wifi toggles.
...
am: b21815e320
Change-Id: Ia08aa862e311dba4af08a1a76c0083519dcdeeb9
2016-11-04 17:22:30 +00:00
Stephen Chen
b21815e320
Add subtypes to tron logging for Wifi toggles.
...
For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.
Bug: 32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105
Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53
2016-11-03 14:16:06 -07:00
Juan Flores
8510f57509
Merge "Fix crash while searching in Settings" am: 176c0c5d98
am: d705a333ca
...
am: 16455893d7
Change-Id: Ic41c29b7d3ba2c90e4c375c843ea8532b236f4a4
2016-11-02 16:47:33 +00:00
Juan Flores
16455893d7
Merge "Fix crash while searching in Settings" am: 176c0c5d98
...
am: d705a333ca
Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb
2016-11-02 16:45:03 +00:00
Juan Flores
d705a333ca
Merge "Fix crash while searching in Settings"
...
am: 176c0c5d98
Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1
2016-11-02 16:42:03 +00:00
Treehugger Robot
176c0c5d98
Merge "Fix crash while searching in Settings"
2016-11-02 16:37:08 +00:00
Fan Zhang
1398c4b367
Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481
...
am: ce01f167e1
Change-Id: I36a67f2241b1a4e2fc8787adb84af31209084ede
2016-11-01 17:25:38 +00:00
Fan Zhang
ce01f167e1
Fix crash when opening account sync detail for external app am: c9cdc25f41
...
am: f3e86ca481
Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add
2016-11-01 17:23:38 +00:00
Fan Zhang
f3e86ca481
Fix crash when opening account sync detail for external app
...
am: c9cdc25f41
Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
2016-11-01 17:21:36 +00:00
Fan Zhang
c9cdc25f41
Fix crash when opening account sync detail for external app
...
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c3
)
2016-10-31 21:57:36 +00:00
Paul Stewart
09797c330c
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
am: 27c5edb968
...
am: dab924f04d
Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0
2016-10-28 21:14:38 +00:00
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
cd9d948d7e
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491
-s ours am: ce2a10b743
...
am: 6e8a67c008
Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75
2016-10-28 02:57:06 +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
Bill Yi
10d6c409d4
Import translations. DO NOT MERGE am: bb6af9902d
-s ours am: 061b294714
-s ours am: 4666b50754
-s ours
...
am: 69e4232f8d
-s ours
Change-Id: Icedc51c61aa4c3b8aa80016617e9e6fc8ebf72fa
2016-10-27 05:36:09 +00:00
Bill Yi
65d4378a8f
Import translations. DO NOT MERGE am: e7f9b0b30b
-s ours am: f8b4927683
-s ours
...
am: f55f67e409
-s ours
Change-Id: I650772657134b60a80f91d2dd0f5d740233aecbc
2016-10-27 05:35:55 +00:00
Bill Yi
69e4232f8d
Import translations. DO NOT MERGE am: bb6af9902d
-s ours am: 061b294714
-s ours
...
am: 4666b50754
-s ours
Change-Id: I89ed1044560f40ebb78d0e1b9bf07a4a7cd575b7
2016-10-27 05:31:37 +00:00
Bill Yi
f55f67e409
Import translations. DO NOT MERGE am: e7f9b0b30b
-s ours
...
am: f8b4927683
-s ours
Change-Id: I9d28fc31d3dc6ead839e36b000d16cec353562fd
2016-10-27 05:31:24 +00:00
Bill Yi
4666b50754
Import translations. DO NOT MERGE am: bb6af9902d
-s ours
...
am: 061b294714
-s ours
Change-Id: If6f1925ffdab47128db255040e97a45733f819d5
2016-10-27 05:27:37 +00:00
Bill Yi
f8b4927683
Import translations. DO NOT MERGE
...
am: e7f9b0b30b
-s ours
Change-Id: I4297eed21e6b8854801a3e9a6f9904b1dadaab72
2016-10-27 05:27:22 +00:00