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
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
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
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
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
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
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
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
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
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
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
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
Jerry Zhang
a1b60e629f
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
This allows us to get rid of an extraneous config switch and
simplify some code.
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit 5d36a177d9
2016-10-25 11:02:21 -07:00
Juan Flores
92fa371a0b
Fix crash while searching in Settings
...
A crash occurrs when power button is pressed during search in Settings
due to IndexOutOfBoundsException in HeaderViewListAdapter.
When suggestions and results are cleared,
the layouts should be invisible to solve this problem.
Bug: 27913974
Test: manual - search "font" and press power button twice
Change-Id: Ia53d393e695dbb238fc4c82a3fe52ef4250d84c1
2016-10-25 12:12:10 +09:00
Bill Yi
680138830a
Import translations. DO NOT MERGE am: 43920d3ba5 -s ours am: 1146d6375c -s ours
...
am: 11d7cba3b2
2016-10-14 09:29:39 +00:00
Bill Yi
77f8f43e79
Import translations. DO NOT MERGE am: 18a64f201b -s ours
...
am: fceb2818d6
2016-10-14 09:29:25 +00:00
Bill Yi
11d7cba3b2
Import translations. DO NOT MERGE am: 43920d3ba5 -s ours
...
am: 1146d6375c
2016-10-14 09:22:56 +00:00
Bill Yi
1146d6375c
Import translations. DO NOT MERGE
...
am: 43920d3ba5
2016-10-14 09:21:26 +00:00
Bill Yi
fceb2818d6
Import translations. DO NOT MERGE
...
am: 18a64f201b
2016-10-14 09:20:40 +00:00
Bill Yi
43920d3ba5
Import translations. DO NOT MERGE
...
Change-Id: Ia1b89602b4538d719cf4b4c2285290598a9d60f6
Auto-generated-cl: translation import
2016-10-13 15:35:00 -07:00
Bill Yi
18a64f201b
Import translations. DO NOT MERGE
...
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
2016-10-13 15:30:06 -07:00
Qi Ding
051c1b298d
Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d
...
am: 85768b3723
2016-10-13 01:34:08 +00:00
Qi Ding
85768b3723
Merge "Fix searched item isn't highlighted" am: 363c529dc6
...
am: 1d07de566d
2016-10-13 01:28:00 +00:00
Qi Ding
1d07de566d
Merge "Fix searched item isn't highlighted"
...
am: 363c529dc6
2016-10-13 01:19:49 +00:00
Treehugger Robot
363c529dc6
Merge "Fix searched item isn't highlighted"
2016-10-13 01:13:41 +00:00
Daniel Sandler
95e41c7bc3
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev am: 0f6ae3aa87
...
am: 93622202d3
2016-10-12 13:58:04 +00:00
Dan Sandler
67d326d2b4
Suppress notif block/silence settings for essential packages. am: acf763e996
...
am: 80df316ac4
2016-10-12 13:57:49 +00:00
Daniel Sandler
93622202d3
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
...
am: 0f6ae3aa87
2016-10-12 13:51:05 +00:00
Dan Sandler
80df316ac4
Suppress notif block/silence settings for essential packages.
...
am: acf763e996
2016-10-12 13:51:04 +00:00
Daniel Sandler
0f6ae3aa87
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
2016-10-12 13:38:56 +00:00
Doris Ling
dc9ea4ceff
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am: 49c0bab8bf
...
am: 739a261295
2016-10-12 00:36:05 +00:00
Doris Ling
ef980e4dd1
Remove pickup gesture settings if sensor is not found. am: 94e0da52fc
...
am: 79aa718669
2016-10-12 00:35:58 +00:00
Doris Ling
739a261295
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
...
am: 49c0bab8bf
2016-10-12 00:23:48 +00:00
Doris Ling
79aa718669
Remove pickup gesture settings if sensor is not found.
...
am: 94e0da52fc
2016-10-12 00:23:46 +00:00
