OSDN Git Service
Carlos Valdivia [Thu, 11 Sep 2014 17:05:31 +0000 (17:05 +0000)]
am
737d2d53: am
61ced6d4: am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
737d2d538b81ee843192d229ef558e69f2a944a9':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:59:49 +0000 (16:59 +0000)]
am
61ced6d4: am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
61ced6d4270b86c336520856cb1545865cb01107':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:49:32 +0000 (16:49 +0000)]
am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
01137c2004a617dae870f9c07b34a29f8706b615':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:42:54 +0000 (16:42 +0000)]
am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:37:09 +0000 (16:37 +0000)]
am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
37b58a420ff59254cbe9420c64685fdb7ea4e375':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends. This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.
Bug:
17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
(cherry picked from commit
f5d3e74ecc2b973941d8adbe40c6b23094b5abb7)
Baligh Uddin [Fri, 15 Aug 2014 21:21:56 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 21:27:40 +0000 (21:27 +0000)]
am
12d64129: (-s ours) am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
12d6412978761f1aab14fbe9244d14c7cefc63b8':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:09 +0000 (21:21 +0000)]
am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
c53e033e0a5f5f408a1818444462d4ea4e7f80f2':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 12:00:45 +0000 (05:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib5aa49667b420a1ff6426274d9205242d638c78c
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 11:57:08 +0000 (04:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b2f01e63ccf0f291b96f749af7d85f2f0036728
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Jun 2014 17:39:48 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b2d1434d76982612d7aa754464a4abf1210daef
Auto-generated-cl: translation import
Griff Hazen [Wed, 18 Jun 2014 04:43:19 +0000 (21:43 -0700)]
DO NOT MERGE Fix build for notification listener internal api change
Bug:
15426276
Change-Id: I3861eb03796f9938f66237454aea148f5c64b370
Baligh Uddin [Wed, 21 May 2014 21:52:35 +0000 (14:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbb361c506a6d3d88653e6699b00d79c344b8c98
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:59:15 +0000 (17:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9185da8de4b0c0818b926377543992356f265dd9
Auto-generated-cl: translation import
Christopher Tate [Tue, 22 Apr 2014 18:05:39 +0000 (18:05 +0000)]
am
95228074: am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
95228074d2e01575799a526a29ec53a61c36aa23':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:58:59 +0000 (17:58 +0000)]
am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
c44d7c6be64be790878ddf1f21c0d9e91d238245':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:17:21 +0000 (10:17 -0700)]
Prohibit uninstall of the default (or only) home app
We suppress the ability to uninstall (including uninstall of updates to
system-bundled apps) when the package in question is either the only
installed home app, or has been explicitly tagged by the user as the
"every time" home app among all those installed.
Bug
14162565
Change-Id: I582bb0d2abf0911ac68813f4c7e6fd7d17bfc2ca
Baligh Uddin [Thu, 17 Apr 2014 00:18:12 +0000 (17:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20c3ae14070c3fae914ec7151dc425ddf518ffa6
Auto-generated-cl: translation import
Baligh Uddin [Mon, 14 Apr 2014 19:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I571889dbba0de412f258289e097ec510fbf02e05
Auto-generated-cl: translation import
Baligh Uddin [Thu, 10 Apr 2014 16:02:35 +0000 (16:02 +0000)]
am
915ef6e3: (-s ours) am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
915ef6e3127b34c73d43e86149b9aabc23216e72':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:00:02 +0000 (16:00 +0000)]
am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
52e3681feb64afaefd5cffa5a9e88a97bca4d48d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:57:44 +0000 (15:57 +0000)]
am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
fba8cd35b71853118508eab15a3cbef96a539dec':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 9 Apr 2014 19:46:43 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff7d2cccff323a2cfb7193d399e8910f226304d7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:43:07 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cec72991260fa660991ca7423299bbf417df000
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84d923dacf746299500503257fd925228b869e82
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Apr 2014 02:31:59 +0000 (02:31 +0000)]
am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
f56d838afe7f813fb2ed761d3ebeb79b79d910a0':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:46 +0000 (02:24 +0000)]
am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
0f2228a5480759551b1faf93d510fc9c1c16ea06':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
2319553cdc644c4fae21ca3ad55564729f409cf4':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Apr 2014 19:10:30 +0000 (12:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c4dadd6e7a78db976f67c0c494b06495a69e45b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:07:10 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c9953f71809e215404a0e150abbba7bb098504a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:05:35 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I933f503cae1b0ae72af3c9f3513ff86355d8e095
Auto-generated-cl: translation import
Xia Wang [Sat, 5 Apr 2014 00:48:38 +0000 (00:48 +0000)]
am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ac768973bc23b9f8f266013c20d301554729fd70':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:43:17 +0000 (00:43 +0000)]
am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ce11881accf5db04e2a54b58176e24de49ef6917':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Fri, 4 Apr 2014 23:23:38 +0000 (16:23 -0700)]
Allow VPN to stay connected for some time before disconnecting it.
Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec
Baligh Uddin [Fri, 4 Apr 2014 14:45:45 +0000 (14:45 +0000)]
am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3f3469aecc1da8bf72482ddae53e11d0245fddd9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:38:19 +0000 (14:38 +0000)]
am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
216b5c501bb81977407b5977e6ee709b34f3a37d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:50 +0000 (14:37 +0000)]
am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
cc01536f7755da6560a23057ac3dbdec10e3993f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:32:06 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Apr 2014 14:32:04 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 4 Apr 2014 14:31:59 +0000 (14:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Adrian Roos [Thu, 3 Apr 2014 14:51:39 +0000 (14:51 +0000)]
am
0b55caf0: am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
0b55caf01af1efa15ff0bfbf50a1726fce788660':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:45:34 +0000 (14:45 +0000)]
am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
a52a37b0fe17109877abbc25943d0d74232f3e5f':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:38:30 +0000 (14:38 +0000)]
am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
1b0b38cfeb54638899ddab48ff9198590f951a55':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:35:13 +0000 (14:35 +0000)]
am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:29:57 +0000 (14:29 +0000)]
am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
90630f6a6d19e169befb8ad8117d53200eb562c4':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:23:57 +0000 (14:23 +0000)]
am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
09235d1065b501aa8a42e0767d72c15e7b846bae':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:17:11 +0000 (14:17 +0000)]
am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
82b3e62a4f8c8a229f700bbf122b8f8854162146':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:11:02 +0000 (14:11 +0000)]
am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
4692a48c28d7002221fec28d5ac324636f81c8f2':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:05:07 +0000 (14:05 +0000)]
am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
c4bfea207acf62c9e70949d3225d082d95d4d193':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3f38173fadc1423d4c36b265a2ab5fdc09d88271':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:55:28 +0000 (13:55 +0000)]
am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3a7690b157c100f3a36b6fdc2578a12845875e06':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:49:53 +0000 (13:49 +0000)]
am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
Baligh Uddin [Wed, 2 Apr 2014 18:52:34 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id18f3fec7657dd9eba74e4fd0f5c34eeea264fd2
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 18:49:10 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2521114c59686637b57ea802bbb72aa7fa01615c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 18:47:25 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife01297eb460bb5881d86ed7c0f672ecb461cb48
Auto-generated-cl: translation import
Adrian Roos [Mon, 31 Mar 2014 19:33:35 +0000 (21:33 +0200)]
Add lockout after trying to enter PIN / Password too often
Enforce the same lockout that is already enforced when entering the pattern.
Bug:
13647935
Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
Xia Wang [Wed, 2 Apr 2014 03:45:56 +0000 (03:45 +0000)]
am
3e238230: am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
3e23823015d2ad0679d89adc2a62c7d568adada8':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:40:26 +0000 (03:40 +0000)]
am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
836eff87a93f5b2857b41763197ab6782581aafc':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:36:50 +0000 (03:36 +0000)]
Merge "Add legacy VPN test framework and test cases" into klp-dev
Xia Wang [Sat, 29 Mar 2014 00:20:53 +0000 (17:20 -0700)]
Add legacy VPN test framework and test cases
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases
Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
Baligh Uddin [Tue, 1 Apr 2014 00:15:49 +0000 (00:15 +0000)]
am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
88adaa72a385c3199787ecd3dae826f25d38572d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:09:19 +0000 (00:09 +0000)]
am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
112916b59634a86195880a1368d8d60a86f33188':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 21:42:20 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 31 Mar 2014 21:40:25 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
John Spurlock [Fri, 28 Mar 2014 13:41:30 +0000 (09:41 -0400)]
DO NOT MERGE Settings: Implement new required method.
Only required since it uses the non-public version
of the api.
Bug:
13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa
Baligh Uddin [Thu, 27 Mar 2014 23:05:03 +0000 (23:05 +0000)]
am
f39672bf: (-s ours) am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
f39672bfac77a604a3a04484f7d88adc4ecf9c66':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 22:22:03 +0000 (22:22 +0000)]
am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
3a9b49f975df7c53e86dd795e21f904442c22a4a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Mar 2014 21:11:08 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09b061fd0c7dd8e4ea00e6627af4e8dfa0d01200
Auto-generated-cl: translation import
Baligh Uddin [Wed, 26 Mar 2014 21:08:55 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 25 Mar 2014 19:01:04 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 25 Mar 2014 17:02:02 +0000 (17:02 +0000)]
am
b86dff84: (-s ours) am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
b86dff8480e486847148f9651bc830b762d307ee':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 16:54:48 +0000 (16:54 +0000)]
am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 20:01:09 +0000 (13:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75bc6fa1afafd7abc9a8d0af3e8825c053225807
Auto-generated-cl: translation import
Baligh Uddin [Mon, 24 Mar 2014 19:59:14 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Mar 2014 19:02:30 +0000 (19:02 +0000)]
am
2e71c1df: (-s ours) am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:41:54 +0000 (18:41 +0000)]
am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
947e8995856a66d05bfb614edf00dd5edfecc4ba':
Import translations. DO NOT MERGE
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
Baligh Uddin [Wed, 19 Mar 2014 20:10:41 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
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.
OSDN Git Service
