OSDN Git Service
Wei Wang [Fri, 28 Feb 2014 00:28:34 +0000 (16:28 -0800)]
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This is cherry pick from master/klp-dev changes.
This reverts commit
eb56b9ccb8fa70a6c567d0bcd02f821e4de4bf7b.
Conflicts:
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87
Conflicts:
src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
Geoff Mendal [Mon, 17 Mar 2014 20:46:32 +0000 (20:46 +0000)]
am
c8131cb9: (-s ours) am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:34:20 +0000 (20:34 +0000)]
am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 19:42:54 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
David Braun [Fri, 14 Mar 2014 16:28:00 +0000 (16:28 +0000)]
am
63ac6a06: am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
63ac6a06efd39078b3fc066896fc7ea003ab34ce':
Add string parameter order to default SMS dialog text
Baligh Uddin [Fri, 14 Mar 2014 16:27:48 +0000 (16:27 +0000)]
am
25503480: (-s ours) am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
255034803c3301cbf93ce64a2740af2abe8dc1f9':
Import translations. DO NOT MERGE
David Braun [Thu, 13 Mar 2014 18:30:11 +0000 (18:30 +0000)]
am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
Add string parameter order to default SMS dialog text
David Braun [Thu, 13 Mar 2014 18:20:48 +0000 (11:20 -0700)]
Add string parameter order to default SMS dialog text
Bug:
13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
Baligh Uddin [Thu, 13 Mar 2014 17:19:21 +0000 (17:19 +0000)]
am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
846f036ef15a2bea6c522e5b75b351b28c29953c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:40:31 +0000 (16:40 +0000)]
am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 10:01:45 +0000 (10:01 +0000)]
am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
0100a310d8184baf9576925d160f8af09aa93b10':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 10:01:42 +0000 (10:01 +0000)]
am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
a74da813ec622822c8bb8b4524439c81e8b90dfa':
DO NOT MERGE Remove extra fragment in captioning preferences
RoboErik [Wed, 8 Jan 2014 01:34:38 +0000 (17:34 -0800)]
b/
12068020 Update calls to InputManager. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/
This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.
Change-Id: I9072c5b5c822b73188a6c572945f87b4a7c03139
Baligh Uddin [Wed, 12 Mar 2014 19:02:29 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
Baligh Uddin [Tue, 11 Mar 2014 17:41:25 +0000 (17:41 +0000)]
am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
14b82fd73f59f51dffee9562057ab747f12134d3':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Mar 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:15:28 +0000 (02:15 +0000)]
am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Tue, 11 Mar 2014 02:15:27 +0000 (02:15 +0000)]
am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
d43d5becb359cfdd5e30f691724739ab216011f0':
DO NOT MERGE Remove extra fragment in captioning preferences
Alan Viverette [Tue, 11 Mar 2014 02:11:52 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:11:41 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
Baligh Uddin [Mon, 10 Mar 2014 22:28:38 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
Wei Wang [Sat, 8 Mar 2014 02:07:30 +0000 (02:07 +0000)]
am
a8e634ca: (-s ours) am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
a8e634ca5367dde80873a0b7643e27284db56336':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:02:19 +0000 (02:02 +0000)]
am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
104eea0b97c63b97040dc26ddf3635257e1b19a2':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:00:36 +0000 (02:00 +0000)]
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
Alan Viverette [Fri, 7 Mar 2014 22:06:29 +0000 (14:06 -0800)]
DO NOT MERGE Add preference for caption text opacity
BUG:
11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
Alan Viverette [Fri, 7 Mar 2014 22:06:07 +0000 (14:06 -0800)]
DO NOT MERGE Remove extra fragment in captioning preferences
BUG:
11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
Rob Fletcher [Thu, 6 Mar 2014 22:41:29 +0000 (22:41 +0000)]
am
04f36983: (-s ours) am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
04f3698345f804848ea7f03c6022dbdb0d8ac28d':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Thu, 6 Mar 2014 21:59:31 +0000 (21:59 +0000)]
am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
549a39b49510dad27da588714f848dc891913239':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Tue, 25 Feb 2014 18:16:12 +0000 (18:16 +0000)]
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML
Bug:
12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
Wei Wang [Mon, 3 Mar 2014 22:58:54 +0000 (14:58 -0800)]
DO NOT MERGE Change bluetooth off display message.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
Baligh Uddin [Thu, 20 Feb 2014 21:02:54 +0000 (21:02 +0000)]
am
af03def3: (-s ours) am
63a354ee: (-s ours) am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
af03def380ca594838ef6caff4f8c23dc78e821c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 20:59:28 +0000 (20:59 +0000)]
am
63a354ee: (-s ours) am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
63a354ee094f3e71773cbdd29359b5c28df2b9f0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 20:56:19 +0000 (20:56 +0000)]
am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
d83484dba0749e01cf80a85cd0d2648a79f9fdf4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 15:23:08 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
Auto-generated-cl: translation import
Amith Yamasani [Wed, 5 Feb 2014 20:43:52 +0000 (20:43 +0000)]
Amith Yamasani [Wed, 5 Feb 2014 20:40:39 +0000 (20:40 +0000)]
am
454df35e: am
3c4603ef: am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
454df35ee323ec9ca21b0c1ed982eba263df70e3':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:37:21 +0000 (20:37 +0000)]
am
3c4603ef: am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3c4603ef1c19510bd4a58aee19935e084603c69b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:35:24 +0000 (20:35 +0000)]
am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
8f9482170835059c11cffa9c554191306db49fbd':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:33:48 +0000 (12:33 -0800)]
am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:30:42 +0000 (12:30 -0800)]
am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0ad774458a627cc4608c717a7efdadf2404d973c':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:52:23 +0000 (11:52 -0800)]
am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:27:30 +0000 (11:27 -0800)]
am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:22:46 +0000 (11:22 -0800)]
am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
1ba09366ccc174d71572ddbe0b80814982d2ae9b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:19:03 +0000 (11:19 -0800)]
am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0fce6123bddf505d1dab3d7a7daff05a0832c007':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:15:01 +0000 (11:15 -0800)]
am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:09:40 +0000 (11:09 -0800)]
am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am
c7843db0: Remove unused DebugIntentSender
* commit '
c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender
Bug:
12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit
26430486e4082c89e31a9489e4309566bda2fec8)
John Spurlock [Tue, 28 Jan 2014 15:48:12 +0000 (15:48 +0000)]
am
04119285: am
cb8a5354: am
3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '
041192855ed8b025246578d80f0b372bf346a2f1':
'When to daydream' dialog does not follow the JB dialog design guide
John Spurlock [Tue, 28 Jan 2014 15:44:53 +0000 (15:44 +0000)]
am
cb8a5354: am
3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '
cb8a53541ec142ee5d57f163496583518ddb5c6e':
'When to daydream' dialog does not follow the JB dialog design guide
John Spurlock [Tue, 28 Jan 2014 15:40:45 +0000 (15:40 +0000)]
am
3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '
3f0f02b94e5be6724659f860aef5e637ff61d3aa':
'When to daydream' dialog does not follow the JB dialog design guide
John Spurlock [Tue, 28 Jan 2014 14:03:41 +0000 (14:03 +0000)]
Merge "'When to daydream' dialog does not follow the JB dialog design guide"
Per Allard [Tue, 25 Jun 2013 07:54:13 +0000 (09:54 +0200)]
'When to daydream' dialog does not follow the JB dialog design guide
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.
Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
Wei Wang [Tue, 19 Nov 2013 09:32:10 +0000 (01:32 -0800)]
BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
Wei Wang [Wed, 13 Nov 2013 01:27:03 +0000 (17:27 -0800)]
Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
Jeff Sharkey [Fri, 10 Jan 2014 23:14:20 +0000 (23:14 +0000)]
am
0cd68e04: am
859909fe: am
b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit '
0cd68e04a9f74aa5afc3e843db498568dd5fa173':
Fix null pointer exceptions in NetworkPolicyEditor
Jeff Sharkey [Fri, 10 Jan 2014 23:11:35 +0000 (23:11 +0000)]
am
859909fe: am
b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit '
859909fee87d4dab6964977834a780acfd2310b2':
Fix null pointer exceptions in NetworkPolicyEditor
Jeff Sharkey [Fri, 10 Jan 2014 23:08:40 +0000 (15:08 -0800)]
am
b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit '
b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
Fix null pointer exceptions in NetworkPolicyEditor
Jeff Sharkey [Fri, 10 Jan 2014 23:04:31 +0000 (23:04 +0000)]
Merge "Fix null pointer exceptions in NetworkPolicyEditor"
Amith Yamasani [Tue, 7 Jan 2014 18:48:22 +0000 (18:48 +0000)]
am
3cfb6767: am
e7d8485a: am
5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '
3cfb676758b5ec44100a0a8cd47f1c4a7a615775':
Dont show "Erase SD Card" when there is none
Amith Yamasani [Tue, 7 Jan 2014 18:45:23 +0000 (18:45 +0000)]
am
e7d8485a: am
5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '
e7d8485a23def2f0670ba2813f5589cbef562d4d':
Dont show "Erase SD Card" when there is none
Amith Yamasani [Tue, 7 Jan 2014 18:42:15 +0000 (10:42 -0800)]
am
5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '
5be77489e2f1f7b5c68763cf7660e844587d5e9e':
Dont show "Erase SD Card" when there is none
Amith Yamasani [Tue, 7 Jan 2014 18:37:53 +0000 (18:37 +0000)]
Merge "Dont show "Erase SD Card" when there is none"
Baligh Uddin [Tue, 7 Jan 2014 05:50:13 +0000 (05:50 +0000)]
am
2659aeb1: (-s ours) am
094de604: (-s ours) am
3f426653: (-s ours) am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
2659aeb1fae6cb031647321df59ad9bbff86847e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:46:12 +0000 (05:46 +0000)]
am
094de604: (-s ours) am
3f426653: (-s ours) am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
094de60467fc1cb2d2635a3a4aa82dff79d355fc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:07:02 +0000 (21:07 -0800)]
am
3f426653: (-s ours) am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
3f4266533121113a62e33fc4b3e1072f841f5d50':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:04:29 +0000 (21:04 -0800)]
am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
6b8a7116a2203b32cff432fd1602cc3e186b2608':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 02:46:29 +0000 (18:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
Elliott Hughes [Fri, 3 Jan 2014 21:42:53 +0000 (21:42 +0000)]
am
8995a94d: am
97886741: am
f85d9841: Merge "Fix elapsed time formatting."
* commit '
8995a94d4eb7d8de10ae0758751357f452a898c9':
Fix elapsed time formatting.
Elliott Hughes [Fri, 3 Jan 2014 21:39:20 +0000 (21:39 +0000)]
am
97886741: am
f85d9841: Merge "Fix elapsed time formatting."
* commit '
97886741b916048cd5974d336c18f2b625dcb7fd':
Fix elapsed time formatting.
Elliott Hughes [Fri, 3 Jan 2014 21:36:27 +0000 (13:36 -0800)]
am
f85d9841: Merge "Fix elapsed time formatting."
* commit '
f85d9841f8e198de656973a2102d3239e628390a':
Fix elapsed time formatting.
Elliott Hughes [Fri, 3 Jan 2014 21:28:12 +0000 (21:28 +0000)]
Merge "Fix elapsed time formatting."
Elliott Hughes [Fri, 3 Jan 2014 20:14:13 +0000 (12:14 -0800)]
Fix elapsed time formatting.
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.
Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
Baligh Uddin [Tue, 31 Dec 2013 00:46:25 +0000 (00:46 +0000)]
am
d28125b7: (-s ours) am
9114be55: (-s ours) am
c9d1e6f4: (-s ours) am
0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '
d28125b742479ce571b7dd32b2c90169200b5479':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 31 Dec 2013 00:44:18 +0000 (00:44 +0000)]
am
9114be55: (-s ours) am
c9d1e6f4: (-s ours) am
0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '
9114be558880d42af1e8095bd7734c7256490aba':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 31 Dec 2013 00:42:54 +0000 (16:42 -0800)]
am
c9d1e6f4: (-s ours) am
0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '
c9d1e6f49cf5be83fad9002942c47499c7fcbc35':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 31 Dec 2013 00:41:18 +0000 (16:41 -0800)]
am
0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '
0ae418b207f37bbc9ed4b0be267054f8244dc70a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 23:09:59 +0000 (15:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
Baligh Uddin [Fri, 27 Dec 2013 04:04:22 +0000 (04:04 +0000)]
am
6c6d0738: (-s ours) am
95fbce75: (-s ours) am
d0c1b8cb: (-s ours) am
0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '
6c6d073847c1c26861671e042a1916b3efcdf5d9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 04:01:11 +0000 (04:01 +0000)]
am
95fbce75: (-s ours) am
d0c1b8cb: (-s ours) am
0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '
95fbce75a7a3c4937c08b610965cc7d7e1aea403':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 03:57:05 +0000 (19:57 -0800)]
am
d0c1b8cb: (-s ours) am
0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '
d0c1b8cbee025b009261a5e9e3ae37e9cbb891ef':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 03:51:27 +0000 (19:51 -0800)]
am
0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '
0f952752e387cd4035193015ff3fa793164c980c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 00:26:39 +0000 (16:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Dec 2013 15:34:33 +0000 (15:34 +0000)]
am
5f4deba1: (-s ours) am
fb793cb9: (-s ours) am
8c810a4e: (-s ours) am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
5f4deba185e4ab2b3c121822add6cf0ec8ec5612':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:32:59 +0000 (15:32 +0000)]
am
fb793cb9: (-s ours) am
8c810a4e: (-s ours) am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
fb793cb94e762c8c50072c529bba093777d3fa9f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:30:01 +0000 (07:30 -0800)]
am
8c810a4e: (-s ours) am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
8c810a4e5dd0435f621e4f3f691bfc567d948ee0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:28:03 +0000 (07:28 -0800)]
am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
7ba72721134adeda10972f68fbcf74a491c6b11e':
Import translations. DO NOT MERGE
Johan Redestig [Thu, 19 Dec 2013 09:30:01 +0000 (10:30 +0100)]
Dont show "Erase SD Card" when there is none
On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:
Card present and mounted -> Erase enabled
Card present but unmounted -> Erase enabled
No card present -> Erase disabled
Card present and MTP attached -> Erase disabled
Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
Baligh Uddin [Thu, 19 Dec 2013 06:12:01 +0000 (22:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
Behrooz Aliabadi [Tue, 16 Jul 2013 10:12:12 +0000 (12:12 +0200)]
Fix null pointer exceptions in NetworkPolicyEditor
This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.
Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
Baligh Uddin [Tue, 17 Dec 2013 17:40:19 +0000 (17:40 +0000)]
am
d48a1386: (-s ours) am
379bb6ef: (-s ours) am
ee9a2cbc: (-s ours) am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
d48a138605e735175b519cb998e478a7aad0c60f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:38:44 +0000 (17:38 +0000)]
am
379bb6ef: (-s ours) am
ee9a2cbc: (-s ours) am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
379bb6ef5a1140497c7cf3510faea1c705fe4583':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:35:44 +0000 (09:35 -0800)]
am
ee9a2cbc: (-s ours) am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
ee9a2cbcf3a12f65ddbc05507bf51ad161feee05':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:33:32 +0000 (09:33 -0800)]
am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
1177cdec4eeeacc787059a7843ade6571f54ac5f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Dec 2013 20:44:01 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
Kenny Root [Fri, 13 Dec 2013 22:04:16 +0000 (22:04 +0000)]
am
ead1bcd9: am
ef2f97c7: am
e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '
ead1bcd9a23a811b25a73e663c556c590e649d82':
Use java.util.Objects instead of internal API
Kenny Root [Fri, 13 Dec 2013 22:01:13 +0000 (22:01 +0000)]
am
ef2f97c7: am
e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '
ef2f97c70e5942f390daf8e227eafa44ea675f09':
Use java.util.Objects instead of internal API
Kenny Root [Fri, 13 Dec 2013 21:58:59 +0000 (13:58 -0800)]
am
e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '
e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
Use java.util.Objects instead of internal API
Kenny Root [Fri, 13 Dec 2013 21:51:29 +0000 (21:51 +0000)]
Merge "Use java.util.Objects instead of internal API"
Kenny Root [Fri, 13 Dec 2013 21:28:08 +0000 (13:28 -0800)]
Use java.util.Objects instead of internal API
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3