OSDN Git Service
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: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: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"
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
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: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: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: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: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: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: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: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: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: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 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 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: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 [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
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: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: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: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"
Paul Stewart [Fri, 28 Oct 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
am:
917b7b863c
Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
Treehugger Robot [Fri, 28 Oct 2016 20:56:35 +0000 (20:56 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
Marie Janssen [Fri, 28 Oct 2016 02:45:39 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
am:
de037d5491 -s ours
Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
Paul Stewart [Thu, 27 Oct 2016 20:29:05 +0000 (13:29 -0700)]
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
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
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
b06766f129dac138568883110f6d2a085b53445b)
Jerry Zhang [Wed, 12 Oct 2016 21:42:56 +0000 (14:42 -0700)]
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
5d36a177d95184aaa0763d07aa38ff028f5a9b9c)
Juan Flores [Mon, 27 Oct 2014 13:12:20 +0000 (14:12 +0100)]
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
Bill Yi [Fri, 14 Oct 2016 09:29:39 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours am:
1146d6375c -s ours
am:
11d7cba3b2 -s ours
Change-Id: I4a666011cda0542627d55677ed4bbe26378e2804
Bill Yi [Fri, 14 Oct 2016 09:29:25 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am:
18a64f201b -s ours
am:
fceb2818d6 -s ours
Change-Id: I5bc44f819b0dcc27aa5dcd411bed23eda90ec733
Bill Yi [Fri, 14 Oct 2016 09:22:56 +0000 (09:22 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours
am:
1146d6375c -s ours
Change-Id: I973f3606e3f7427f74c9af29d58ba0611b865704
Bill Yi [Fri, 14 Oct 2016 09:21:26 +0000 (09:21 +0000)]
Import translations. DO NOT MERGE
am:
43920d3ba5 -s ours
Change-Id: I72f1d361a29a4391c33c5fd0fb8a3340287314f9
Bill Yi [Fri, 14 Oct 2016 09:20:40 +0000 (09:20 +0000)]
Import translations. DO NOT MERGE
am:
18a64f201b -s ours
Change-Id: I91b138778b8488b63afa11c1c6625f7a72acbd62
Bill Yi [Thu, 13 Oct 2016 22:35:00 +0000 (15:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1b89602b4538d719cf4b4c2285290598a9d60f6
Auto-generated-cl: translation import
Bill Yi [Thu, 13 Oct 2016 22:30:06 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
Qi Ding [Thu, 13 Oct 2016 01:34:08 +0000 (01:34 +0000)]
Merge "Fix searched item isn't highlighted" am:
363c529dc6 am:
1d07de566d
am:
85768b3723
Change-Id: I7bb1c3b3a5dbb1ee4e6d8934a7be542076d1e863
Qi Ding [Thu, 13 Oct 2016 01:28:00 +0000 (01:28 +0000)]
Merge "Fix searched item isn't highlighted" am:
363c529dc6
am:
1d07de566d
Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06
Qi Ding [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix searched item isn't highlighted"
am:
363c529dc6
Change-Id: I57e09b8403422338c80bd369d41822bf26383361
Treehugger Robot [Thu, 13 Oct 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Fix searched item isn't highlighted"
Daniel Sandler [Wed, 12 Oct 2016 13:58:04 +0000 (13:58 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev am:
0f6ae3aa87
am:
93622202d3
Change-Id: I8fa5d3437be488fa3c5f1d57a2032636d4fcd6b1
Dan Sandler [Wed, 12 Oct 2016 13:57:49 +0000 (13:57 +0000)]
Suppress notif block/silence settings for essential packages. am:
acf763e996
am:
80df316ac4
Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92
Daniel Sandler [Wed, 12 Oct 2016 13:51:05 +0000 (13:51 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
am:
0f6ae3aa87
Change-Id: I87fbb0cd4c462a7df76e2f5719aafc54ee671076
Dan Sandler [Wed, 12 Oct 2016 13:51:04 +0000 (13:51 +0000)]
Suppress notif block/silence settings for essential packages.
am:
acf763e996
Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
Daniel Sandler [Wed, 12 Oct 2016 13:38:56 +0000 (13:38 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
Doris Ling [Wed, 12 Oct 2016 00:36:05 +0000 (00:36 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am:
49c0bab8bf
am:
739a261295
Change-Id: I25ceb867e68720f22405a944669c5fc9ca3570f4
Doris Ling [Wed, 12 Oct 2016 00:35:58 +0000 (00:35 +0000)]
Remove pickup gesture settings if sensor is not found. am:
94e0da52fc
am:
79aa718669
Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0
Doris Ling [Wed, 12 Oct 2016 00:23:48 +0000 (00:23 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am:
49c0bab8bf
Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99
Doris Ling [Wed, 12 Oct 2016 00:23:46 +0000 (00:23 +0000)]
Remove pickup gesture settings if sensor is not found.
am:
94e0da52fc
Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
Doris Ling [Tue, 11 Oct 2016 23:42:41 +0000 (23:42 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
Doris Ling [Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)]
Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.
Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.
Bug:
32072298
Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
Nick Kralevich [Tue, 11 Oct 2016 18:28:05 +0000 (18:28 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev am:
09d3961326
am:
2c89007df6
Change-Id: Iaddfa85f013b44648b12fed164e26d02251471fc
Nick Kralevich [Tue, 11 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Delete "Show CPU usage" am:
73dfef91b2
am:
0f3067ce58
Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715
Nick Kralevich [Tue, 11 Oct 2016 18:14:06 +0000 (18:14 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am:
09d3961326
Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819
Nick Kralevich [Tue, 11 Oct 2016 18:09:16 +0000 (18:09 +0000)]
Delete "Show CPU usage"
am:
73dfef91b2
Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848
Nick Kralevich [Tue, 11 Oct 2016 18:03:25 +0000 (18:03 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 16:03:29 +0000 (09:03 -0700)]
Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.
Bug:
21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
Bill Yi [Tue, 11 Oct 2016 15:14:56 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours am:
9f8644c04f -s ours
am:
d13a041835 -s ours
Change-Id: Ibcfcbaa91d51944f0861d0f65e50461004db8779
Bill Yi [Tue, 11 Oct 2016 15:14:42 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am:
6acf691f62 -s ours
am:
557f83edb5 -s ours
Change-Id: I4d4f4c323c27dced0088b588567c7b42f3acb3e1
Bill Yi [Tue, 11 Oct 2016 15:09:26 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours
am:
9f8644c04f -s ours
Change-Id: I7dc4c1f300dd8a3afdd55cca1224c81e83528478
Bill Yi [Tue, 11 Oct 2016 15:09:11 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE
am:
6acf691f62 -s ours
Change-Id: I2e8466a2baab0727b0a03ab96589cb0a1bd312a3
Bill Yi [Tue, 11 Oct 2016 15:03:11 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE
am:
64d3e22e11 -s ours
Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948
Bill Yi [Mon, 10 Oct 2016 19:39:26 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5616dbd321f70984c0386fd5b2e48f608ede25cb
Auto-generated-cl: translation import