OSDN Git Service
Pavlin Radoslavov [Thu, 26 Jan 2017 19:25:49 +0000 (19:25 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
6a153ac4aa
am:
a53cc5068d
Change-Id: Iee8bf4a93a7c6879a144616648fd629c3109e40d
Pavlin Radoslavov [Thu, 26 Jan 2017 19:20:20 +0000 (19:20 +0000)]
Merge "Integration of the AAC codec for A2DP source"
am:
6a153ac4aa
Change-Id: I1ca21a7c2a2c2792ba3fa6055f767d3b8686f5d5
Treehugger Robot [Thu, 26 Jan 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Integration of the AAC codec for A2DP source"
Pavlin Radoslavov [Sat, 14 Jan 2017 08:50:59 +0000 (00:50 -0800)]
Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug:
30958229
Change-Id: Icef9ce9fb8e41cad65bc57bf078513d0c7bf7b9a
Steven Moreland [Thu, 26 Jan 2017 10:03:46 +0000 (10:03 +0000)]
Merge "Development Options: toggle binderized hals" am:
5f854f39a8
am:
8076dcde0c
Change-Id: Idb3f71707b7b1b091e3a18517852fff66e01cf08
Steven Moreland [Thu, 26 Jan 2017 10:01:15 +0000 (10:01 +0000)]
Merge "Development Options: toggle binderized hals"
am:
5f854f39a8
Change-Id: Id05768135b0609e917f4e1888caf2724ebf9ba3a
Treehugger Robot [Thu, 26 Jan 2017 09:57:38 +0000 (09:57 +0000)]
Merge "Development Options: toggle binderized hals"
Steven Moreland [Fri, 13 Jan 2017 19:31:41 +0000 (11:31 -0800)]
Development Options: toggle binderized hals
This allows for quick performance testing and also for a better
dogfooding experience.
Bug:
34256441
Test: Verification with getprop.
Change-Id: I81c5e0b1044d4569a6fe55a4b30f7e21c4465fc2
Marie Janssen [Wed, 25 Jan 2017 16:08:01 +0000 (16:08 +0000)]
Merge "Make headset icons consistent before / after pairing" am:
690bdb22c9
am:
a2e068a2b4
Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8
Marie Janssen [Wed, 25 Jan 2017 16:06:00 +0000 (16:06 +0000)]
Merge "Make headset icons consistent before / after pairing"
am:
690bdb22c9
Change-Id: I64a9a3a7d8a2f110ee1809af33583f82fc4b4f57
Marie Janssen [Wed, 25 Jan 2017 16:02:13 +0000 (16:02 +0000)]
Merge "Make headset icons consistent before / after pairing"
Xiaodong Xu [Mon, 25 May 2015 07:37:05 +0000 (09:37 +0200)]
Make headset icons consistent before / after pairing
Previously A2DP would be shown before pairing with a HFP device.
bug:
30677445
Change-Id: I0e9ab17197e6ee099d890d5368def36a14ca8344
Robin Lee [Thu, 19 Jan 2017 23:23:37 +0000 (23:23 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established" am:
4ce19f5c4f
am:
fde3c6d74a
Change-Id: Id20c96f550ecf7c05926eaea8a29575aeb8aaa07
Robin Lee [Thu, 19 Jan 2017 23:13:04 +0000 (23:13 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established"
am:
4ce19f5c4f
Change-Id: Ib35450b0c389da1bbba311c05d1d0346eb612b9e
Robin Lee [Thu, 19 Jan 2017 23:02:20 +0000 (23:02 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established"
Paul Duffin [Thu, 19 Jan 2017 15:20:26 +0000 (15:20 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
a6b0c881fd
am:
a3da659863
Change-Id: Id36b48a4a25aa564b5270ad16aa5a2eb1eadfadb
Paul Duffin [Thu, 19 Jan 2017 15:17:53 +0000 (15:17 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
am:
a6b0c881fd
Change-Id: Iadb65fd5a2630e74071866f2d0b4347d29a71af1
Treehugger Robot [Thu, 19 Jan 2017 15:13:14 +0000 (15:13 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
Paul Duffin [Tue, 17 Jan 2017 14:49:42 +0000 (14:49 +0000)]
Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug:
30188076
Test: make checkbuild
Merged-In: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9
Change-Id: I980111b4b83d16ccd9d3a277ab2587bf638a2c8a
Pavlin Radoslavov [Wed, 18 Jan 2017 20:29:44 +0000 (20:29 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
b057b2da02
am:
058533ae25
Change-Id: I49b4565644c584a69897f4b642a1b308fe9df0f0
Pavlin Radoslavov [Wed, 18 Jan 2017 20:25:52 +0000 (20:25 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am:
b057b2da02
Change-Id: I892ea30d6fb15ba10859cd48788260e5ad8ad380
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
Tamas Berghammer [Wed, 18 Jan 2017 16:20:00 +0000 (16:20 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit
fbd5f5fdce07a6d77dd2c3309c7272bf33414396.
Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
Pavlin Radoslavov [Wed, 18 Jan 2017 01:14:24 +0000 (17:14 -0800)]
Update/cleanup Bluetooth Codec strings in Developer Settings
* Use the summary strings instead of the titles strings as appropriate.
* Use proper translatable strings instead of hard-coded "Streaming: "
embedded string.
Test: UI visual observation
Change-Id: I0222afc30c75e68e2568c33c781755802d86c502
insight.lee [Mon, 16 Jan 2017 23:27:01 +0000 (08:27 +0900)]
Clear VPN after Clear credentials if VPN is being established
1. There is no way to disconnect VPN after 'Clear credentials'
without removing whole Internet connection because VPN profile to
disconnect is removed when Clear credentials.
2. This commit checks whether VPN is being established or not when
Clear credentials and disconnect VPN if VPN is being established.
Lastly, this shows a toast message to inform VPN disconnected.
Test: manual - took a photo
Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Bug:
29093779
Change-Id: Id5ea01c8731b3b0fca2a31d9d84e8c103952b377
Tamas Berghammer [Wed, 22 Jun 2016 14:34:45 +0000 (15:34 +0100)]
Update package names to work with the proto3 compiler
Bug: b/
28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit
265d3c2a0c36251bf8a9f571d7239b6dd404d942)
Pavlin Radoslavov [Wed, 11 Jan 2017 06:21:10 +0000 (06:21 +0000)]
Merge "Moved the Bluetooth-related default config init within onCreate()" am:
ab9e269d06
am:
6e154cfb98
Change-Id: I985957eb0322dc13571705f9cc8d5abe65a931bb
Pavlin Radoslavov [Wed, 11 Jan 2017 06:15:39 +0000 (06:15 +0000)]
Merge "Moved the Bluetooth-related default config init within onCreate()"
am:
ab9e269d06
Change-Id: Ic0d0d4b6d63b25afafae35b81686e746939646fd
Treehugger Robot [Wed, 11 Jan 2017 06:07:39 +0000 (06:07 +0000)]
Merge "Moved the Bluetooth-related default config init within onCreate()"
Pavlin Radoslavov [Tue, 10 Jan 2017 23:40:13 +0000 (15:40 -0800)]
Moved the Bluetooth-related default config init within onCreate()
This should avoid potential crashes in case somehow onCreateView() is
called without onCreate() being called first.
Test: Manual UI interaction with Developer Settings
Bug:
34192829
Change-Id: Iaf46d05f30d20f98727c4dbfb91feef8509c92f7
Yanhong Shen [Tue, 10 Jan 2017 21:28:47 +0000 (21:28 +0000)]
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am:
f952a87060
am:
a9e9bf20e8
Change-Id: Ia45623e60a3a774b3b21dd58d350f3c408aaff20
Yanhong Shen [Tue, 10 Jan 2017 21:24:19 +0000 (21:24 +0000)]
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off"
am:
f952a87060
Change-Id: I0da164fbdbb04e54be2a26df85b8fcc1f58192e5
Treehugger Robot [Tue, 10 Jan 2017 21:15:55 +0000 (21:15 +0000)]
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off"
Yanhong Shen [Fri, 1 Jul 2016 07:25:19 +0000 (15:25 +0800)]
Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off
When Wi-Fi is off, Advanced menus below should be disabled:
1. "Wi-Fi Direct"
2. "WPS Push Button"
3. "WPS Pin Entry"
in Settings->Wi-Fi->Advanced.
Bug:
31102679
Test: Test with the device
Change-Id: I5af4c18512c991211eb42ef759e00917828f1b4c
Pavlin Radoslavov [Sat, 7 Jan 2017 01:28:45 +0000 (01:28 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bb08073b6f
am:
0115cc702a
Change-Id: I8d2e73d3c91ac18005f8e6f74e39c81e84ad41c3
Pavlin Radoslavov [Sat, 7 Jan 2017 01:24:43 +0000 (01:24 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
am:
bb08073b6f
Change-Id: I1586182f52b726a56c92d2ed35e1e6dd6eff237e
Treehugger Robot [Sat, 7 Jan 2017 01:19:33 +0000 (01:19 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
Pavlin Radoslavov [Thu, 5 Jan 2017 18:52:21 +0000 (10:52 -0800)]
Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug:
30958229
Change-Id: I75027200561e6c51fa767c427ed09b647757d0ab
Ruchi Kandoi [Thu, 5 Jan 2017 18:11:54 +0000 (18:11 +0000)]
Merge "Update Android Beam feature summary string" am:
27a59e1d2c
am:
abe9a41d19
Change-Id: I0a2cf7b82818102adc857cd38007a6e3ba7b4dd9
Ruchi Kandoi [Thu, 5 Jan 2017 18:08:22 +0000 (18:08 +0000)]
Merge "Update Android Beam feature summary string"
am:
27a59e1d2c
Change-Id: I6edef06c6e0c94dc8c5d27003f19b60b2f6c5f4c
Treehugger Robot [Thu, 5 Jan 2017 18:04:12 +0000 (18:04 +0000)]
Merge "Update Android Beam feature summary string"
Ruchi Kandoi [Fri, 23 Dec 2016 01:33:01 +0000 (17:33 -0800)]
Update Android Beam feature summary string
Bug:
32183480
Test: compiles
Change-Id: I750e998ea73b10645666c7d080afe7320b705d47
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
gaochong [Wed, 28 Dec 2016 18:55:47 +0000 (18:55 +0000)]
Merge "Handle SubSettings instance leaks in Index.java" am:
527b2b220a
am:
bf4a67ec0f
Change-Id: I89d30398cfe13e72ccbcbb92d5d4e0eda5f350ae
gaochong [Wed, 28 Dec 2016 18:48:16 +0000 (18:48 +0000)]
Merge "Handle SubSettings instance leaks in Index.java"
am:
527b2b220a
Change-Id: Iccfeef38ca133bb63708b9f6ce90c457aadf62f6
Treehugger Robot [Wed, 28 Dec 2016 18:43:26 +0000 (18:43 +0000)]
Merge "Handle SubSettings instance leaks in Index.java"
gaochong [Wed, 21 Dec 2016 12:06:37 +0000 (20:06 +0800)]
Handle SubSettings instance leaks in Index.java
Index's constructor will hold context of caller.
context.getApplicationContext() instead of context to prevent activity
leaks.
Bug: https://code.google.com/p/android/issues/detail?id=223322
Test: manual-start a new activity call Index constructor ,then pressed
back.
Change-Id: Ic12af62f9b718d328610a57985f64ca4629bab99
Signed-off-by: gaochong <gaochong@xiaomi.com>
Robin Lee [Fri, 23 Dec 2016 10:39:24 +0000 (10:39 +0000)]
Merge "Update VPN preference state after disallow configuring VPN policy has changed." am:
601d339868
am:
4395176792
Change-Id: Ie71a58c50fde7c5ecc4f80dfe5eb854428044480
Robin Lee [Fri, 23 Dec 2016 10:33:22 +0000 (10:33 +0000)]
Merge "Update VPN preference state after disallow configuring VPN policy has changed."
am:
601d339868
Change-Id: I94666d5f7812b15432b44ed50d8d396b373d3e69
Robin Lee [Fri, 23 Dec 2016 10:29:02 +0000 (10:29 +0000)]
Merge "Update VPN preference state after disallow configuring VPN policy has changed."
insight.lee [Thu, 22 Dec 2016 07:14:44 +0000 (16:14 +0900)]
Update VPN preference state after disallow configuring VPN policy has changed.
1. When Settings > More and change disallow configuring VPN policy
and resume Settings, update VPN preference state.
2. When Settings > More > VPN and change disallow configuring VPN policy
and resume VPN Settings, update its state.
Test: manual
Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Change-Id: I4f3c85733ca6ba05cba46e2f4854f54a42b10c21
nharold [Wed, 21 Dec 2016 21:53:18 +0000 (21:53 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am:
c98ca3da26
am:
9b0c6a525d
Change-Id: I94f2d7b9234e4fb6a2bfe15171a5145f446a0233
nharold [Wed, 21 Dec 2016 21:49:04 +0000 (21:49 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List"
am:
c98ca3da26
Change-Id: Ic7b16572aab3a3d10ee06d1810ce0aa05a9e5b1d
nharold [Wed, 21 Dec 2016 21:40:21 +0000 (21:40 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List"
Nathan Harold [Tue, 20 Dec 2016 02:04:52 +0000 (18:04 -0800)]
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
To facilitate user recovery from issues where the band mode
list is incomplete and may not report the full list of bands,
the user should *always* have the ability to set the band mode
selection to AUTOMATIC.
Bug:
28124606
Test: compilation, UI check
Change-Id: Ib961d9b058ade5a51dfec0777971c8c98dee2033
Jeremy Joslin [Mon, 19 Dec 2016 22:06:22 +0000 (22:06 +0000)]
Merge "New pref toggle for network recommendations." am:
a5249906ab
am:
2b03ffb264
Change-Id: Ie4f4255740559a3018ba84df0084ff94995aa87d
Jeremy Joslin [Mon, 19 Dec 2016 22:02:23 +0000 (22:02 +0000)]
Merge "New pref toggle for network recommendations."
am:
a5249906ab
Change-Id: I7f39f341077bcc403c06d08a87d394f0f25f6356
Treehugger Robot [Mon, 19 Dec 2016 21:54:52 +0000 (21:54 +0000)]
Merge "New pref toggle for network recommendations."
Jeremy Joslin [Tue, 13 Dec 2016 22:14:45 +0000 (14:14 -0800)]
New pref toggle for network recommendations.
Adding a new toggle to control whether network
recommendations are enabled.
Removed the "Use open networks" pref and its associated strings
and components as it's no longer needed.
Test: Built and ran.
BUG:
33549591
BUG:
33270391
Change-Id: I03069ca30d06089600ca958f8da117564189f839
Merged-In: I7248ac32e0598d82107c150372c1fe4e9e2243a5
Merged-In: I82eed6dc7daef1c622ea4e33ce42c331e0cd786d
Zhendong Yang [Wed, 14 Dec 2016 05:46:08 +0000 (05:46 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog" am:
783ff43769
am:
7598c6201d
Change-Id: I97e9ef07df912e7bac3c4657272feab943bcb84e
Zhendong Yang [Wed, 14 Dec 2016 05:38:34 +0000 (05:38 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog"
am:
783ff43769
Change-Id: Ie4f4856f6e4b1bb4970013b2425bb39d34383859
Treehugger Robot [Wed, 14 Dec 2016 05:30:16 +0000 (05:30 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog"
Marie Janssen [Mon, 12 Dec 2016 21:40:16 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am:
8c11340b0c -s ours
am:
0d60028669 -s ours
Change-Id: I38c9941c8a7102c6e987fda1d7d1d1b0155ccde9
Marie Janssen [Mon, 12 Dec 2016 21:34:45 +0000 (21:34 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
am:
8c11340b0c -s ours
Change-Id: I60f481691445aeb4926b177d83f39077b9a72921
Marie Janssen [Mon, 12 Dec 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
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
Zhendong Yang [Thu, 24 Mar 2016 02:54:49 +0000 (10:54 +0800)]
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
xiaocheng.x.wang [Fri, 9 Dec 2016 21:02:45 +0000 (21:02 +0000)]
Merge "Fix apn can't be updated when pressing back key" am:
5c6e7a2116
am:
2d38abb49a
Change-Id: Ic105a97e7ee4d56f16dc8f67d2b09a6ebd55b3ba
xiaocheng.x.wang [Fri, 9 Dec 2016 20:57:46 +0000 (20:57 +0000)]
Merge "Fix apn can't be updated when pressing back key"
am:
5c6e7a2116
Change-Id: I5f7cf29476e88c3603c902c5e501bef08fad5c8c
Treehugger Robot [Fri, 9 Dec 2016 20:50:39 +0000 (20:50 +0000)]
Merge "Fix apn can't be updated when pressing back key"
Bill Yi [Thu, 1 Dec 2016 19:07:44 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE
am:
5a05a8a4ea -s ours
Change-Id: Ia227c18a81391b0609518b9a68001598bd389191
Bill Yi [Thu, 1 Dec 2016 18:11:25 +0000 (10:11 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020
Amin Shaikh [Thu, 1 Dec 2016 02:21:13 +0000 (02:21 +0000)]
Merge "Refactor NetworkScoreAppManager for testing." am:
512368a22e
am:
3140bb5ace
Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001
Amin Shaikh [Thu, 1 Dec 2016 02:11:06 +0000 (02:11 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
am:
512368a22e
Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
Stephen Chen [Thu, 1 Dec 2016 00:09:32 +0000 (00:09 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am:
666c9d7ea5
am:
539eaa34d5
Change-Id: I32a45ccc9a08d8f90e8801f727853fc320db9dc5
Stephen Chen [Wed, 30 Nov 2016 23:59:43 +0000 (23:59 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
am:
666c9d7ea5
Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2
Treehugger Robot [Wed, 30 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
Amin Shaikh [Tue, 22 Nov 2016 01:28:47 +0000 (17:28 -0800)]
Refactor NetworkScoreAppManager for testing.
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
Stephen Chen [Tue, 15 Nov 2016 00:24:08 +0000 (16:24 -0800)]
Link WIFI_SAVED_NETWORK_SETTINGS action with activity.
Bug:
32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
Fan Zhang [Wed, 23 Nov 2016 23:29:22 +0000 (23:29 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41
am:
f3e86ca481
Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
Bill Yi [Wed, 23 Nov 2016 23:29:07 +0000 (23:29 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours am:
061b294714 -s ours
am:
4666b50754 -s ours
Change-Id: I1aaca58936606507f763770e65dace147da5153a
Bill Yi [Wed, 23 Nov 2016 23:28:53 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
e7f9b0b30b -s ours
am:
f8b4927683 -s ours
Change-Id: I4be07f881fd515c3668c12ecab6d2af8452d1ec0
Steven Ng [Wed, 23 Nov 2016 23:28:38 +0000 (23:28 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am:
378dec1495
am:
046a63450f
Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
Bill Yi [Wed, 23 Nov 2016 23:28:25 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
a6d9842695 -s ours am:
c027907edc -s ours
am:
f8032d0b15 -s ours
Change-Id: I0c7f588a8868df3a7235dbbac1eff725dc591070
Bill Yi [Wed, 23 Nov 2016 23:28:12 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours
am:
9a22968ff8 -s ours
Change-Id: Ic98ab45a4b2e31007a18e7018ad5f31c2b82d2ae
Bill Yi [Mon, 21 Nov 2016 01:28:26 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am:
001632d55c -s ours
Change-Id: Ib267ac961a6ef99c9c1401e8967725b0f7914bac
Bill Yi [Mon, 21 Nov 2016 00:12:14 +0000 (16:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002
Jerry Zhang [Thu, 17 Nov 2016 00:24:57 +0000 (00:24 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am:
89a055aa9d
am:
1451a4af78
Change-Id: I90048a233d80ee023e9f775b540248b62aa5e4ea
Jerry Zhang [Thu, 17 Nov 2016 00:24:50 +0000 (00:24 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method am:
a1b60e629f
am:
a75fa91247
Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6
Jerry Zhang [Thu, 17 Nov 2016 00:12:59 +0000 (00:12 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
am:
89a055aa9d
Change-Id: I8bad2864a848b46c99e2693acacb320615338ec8
Jerry Zhang [Thu, 17 Nov 2016 00:09:38 +0000 (00:09 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method
am:
a1b60e629f
Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd
Jerry Zhang [Wed, 16 Nov 2016 23:59:32 +0000 (23:59 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
Sohani Rao [Mon, 14 Nov 2016 21:21:49 +0000 (21:21 +0000)]
Merge "Add WiFi toggle prompts - settings" am:
b4b2c2aa43
am:
6f126a8f5c
Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c
Sohani Rao [Mon, 14 Nov 2016 21:14:54 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - settings"
am:
b4b2c2aa43
Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - settings"
Svetoslav Ganov [Wed, 27 Jul 2016 01:26:45 +0000 (18:26 -0700)]
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
xiaocheng.x.wang [Tue, 23 Aug 2016 05:53:47 +0000 (13:53 +0800)]
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
Juan Flores [Wed, 2 Nov 2016 16:45:03 +0000 (16:45 +0000)]
Merge "Fix crash while searching in Settings" am:
176c0c5d98
am:
d705a333ca
Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb
Juan Flores [Wed, 2 Nov 2016 16:42:03 +0000 (16:42 +0000)]
Merge "Fix crash while searching in Settings"
am:
176c0c5d98
Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1
Treehugger Robot [Wed, 2 Nov 2016 16:37:07 +0000 (16:37 +0000)]
Merge "Fix crash while searching in Settings"