Zhendong Yang
8711f4055d
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769
...
am: 7598c6201d
2016-12-14 05:46:08 +00:00
Zhendong Yang
7598c6201d
Merge "Fix crash when rotating HighPowerDetail dialog"
...
am: 783ff43769
2016-12-14 05:38:34 +00:00
Treehugger Robot
783ff43769
Merge "Fix crash when rotating HighPowerDetail dialog"
2016-12-14 05:30:16 +00:00
Marie Janssen
f1342adb86
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours
...
am: 0d60028669
2016-12-12 21:40:16 +00:00
Marie Janssen
0d60028669
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
...
am: 8c11340b0c
2016-12-12 21:34:45 +00:00
Marie Janssen
8c11340b0c
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
2016-12-12 21:27:23 +00:00
Svetoslav Ganov
c6a074c80d
DO NOT MERGE 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: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
2016-12-12 09:44:39 -08:00
Zhendong Yang
cb911e3402
Fix crash when rotating HighPowerDetail dialog
...
When rotating the device, the Activity of the target
Fragment become null. So NullPointerException occurs.
The dialog should check if the Activity is null
before calling onActivityResult().
Bug: 28333723
Test: manual - go to Settings > Apps > Clock,
click Battery optimization and rotate device
Change-Id: I7f68d6ece7d169fd96d04c1788e55ee506aae1ae
2016-12-12 20:55:40 +09:00
xiaocheng.x.wang
2366d4dcfd
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
...
am: 2d38abb49a
2016-12-09 21:02:45 +00:00
xiaocheng.x.wang
2d38abb49a
Merge "Fix apn can't be updated when pressing back key"
...
am: 5c6e7a2116
2016-12-09 20:57:46 +00:00
Treehugger Robot
5c6e7a2116
Merge "Fix apn can't be updated when pressing back key"
2016-12-09 20:50:39 +00:00
Bill Yi
f131815859
Import translations. DO NOT MERGE
...
am: 5a05a8a4ea
2016-12-01 19:07:44 +00:00
Bill Yi
5a05a8a4ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020
2016-12-01 10:11:25 -08:00
Amin Shaikh
7c8af0aedc
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
...
am: 3140bb5ace
2016-12-01 02:21:13 +00:00
Amin Shaikh
3140bb5ace
Merge "Refactor NetworkScoreAppManager for testing."
...
am: 512368a22e
2016-12-01 02:11:06 +00:00
Treehugger Robot
512368a22e
Merge "Refactor NetworkScoreAppManager for testing."
2016-12-01 01:59:14 +00:00
Stephen Chen
701e558586
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
...
am: 539eaa34d5
2016-12-01 00:09:32 +00:00
Stephen Chen
539eaa34d5
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
...
am: 666c9d7ea5
2016-11-30 23:59:43 +00:00
Treehugger Robot
666c9d7ea5
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
2016-11-30 20:25:13 +00:00
Amin Shaikh
f91ac62756
Refactor NetworkScoreAppManager for testing.
...
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
2016-11-29 10:17:34 -08:00
Stephen Chen
e365aa8cd9
Link WIFI_SAVED_NETWORK_SETTINGS action with activity.
...
Bug: 32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
2016-11-28 16:29:31 -08:00
Fan Zhang
b69ec294c2
Fix crash when opening account sync detail for external app am: c9cdc25f41
...
am: f3e86ca481
2016-11-23 23:29:22 +00:00
Bill Yi
5cca5a64e8
Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours
...
am: 4666b50754
2016-11-23 23:29:07 +00:00
Bill Yi
57b56329f3
Import translations. DO NOT MERGE am: e7f9b0b30b -s ours
...
am: f8b4927683
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
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
2016-11-23 23:28:25 +00:00
Bill Yi
88b043714b
Import translations. DO NOT MERGE am: 475763d01c -s ours
...
am: 9a22968ff8
2016-11-23 23:28:12 +00:00
Bill Yi
9e17133192
Import translations. DO NOT MERGE
...
am: 001632d55c
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
3473bc219e
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d
...
am: 1451a4af78
2016-11-17 00:24:57 +00:00
Jerry Zhang
fd764ac0e3
Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
...
am: a75fa91247
2016-11-17 00:24:50 +00:00
Jerry Zhang
1451a4af78
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
...
am: 89a055aa9d
2016-11-17 00:12:59 +00:00
Jerry Zhang
a75fa91247
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
am: a1b60e629f
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
6cebca2599
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
...
am: 6f126a8f5c
2016-11-14 21:21:49 +00:00
Sohani Rao
6f126a8f5c
Merge "Add WiFi toggle prompts - settings"
...
am: b4b2c2aa43
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
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
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
Juan Flores
16455893d7
Merge "Fix crash while searching in Settings" am: 176c0c5d98
...
am: d705a333ca
2016-11-02 16:45:03 +00:00
Juan Flores
d705a333ca
Merge "Fix crash while searching in Settings"
...
am: 176c0c5d98
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
f3e86ca481
Fix crash when opening account sync detail for external app
...
am: c9cdc25f41
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
dab924f04d
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
...
am: 27c5edb968
2016-10-28 21:09:38 +00:00
Paul Stewart
27c5edb968
Merge "Don't display an invalid Wi-Fi MAC address"
...
am: 917b7b863c
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
2016-10-28 02:52:12 +00:00
Marie Janssen
ce2a10b743
Merge "Add Bluetooth toggle prompts - settings"
...
am: de037d5491
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
