OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am...
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

10 years agoam 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am...
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

10 years agoam 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am...
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

10 years agoam c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am...
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

10 years agoam 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am...
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

10 years agoam 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am...
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

10 years agoam 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove...
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

10 years agoam 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugI...
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

10 years agoam 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: 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

10 years agoam 7a2d8bd4: am 49d502a4: am c7843db0: 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

10 years agoam 49d502a4: am c7843db0: 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

10 years agoam c7843db0: 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

10 years agoRemove 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)

10 years agoam 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design...
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

10 years agoMerge "'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"

10 years ago'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

10 years agoam b5377a71: Merge "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

10 years agoMerge "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"

10 years agoam 5be77489: Merge "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

10 years agoMerge "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"

10 years agoam 3f426653: (-s ours) am 6b8a7116: (-s ours) 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

10 years agoam 6b8a7116: (-s ours) 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

10 years agoImport 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

10 years agoam f85d9841: Merge "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.

10 years agoMerge "Fix elapsed time formatting."
Elliott Hughes [Fri, 3 Jan 2014 21:28:12 +0000 (21:28 +0000)]
Merge "Fix elapsed time formatting."

10 years agoFix 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

10 years agoam c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) 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

10 years agoam 0ae418b2: (-s ours) 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

10 years agoImport 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

10 years agoam d0c1b8cb: (-s ours) am 0f952752: (-s ours) 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

10 years agoam 0f952752: (-s ours) 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

10 years agoImport 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

10 years agoam 8c810a4e: (-s ours) am 7ba72721: (-s ours) 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

10 years agoam 7ba72721: (-s ours) 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

10 years agoDont show "Erase SD Card" when there is none
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoFix null pointer exceptions in NetworkPolicyEditor
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

10 years agoam ee9a2cbc: (-s ours) am 1177cdec: (-s ours) 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

10 years agoam 1177cdec: (-s ours) 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

10 years agoImport 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

10 years agoam e14a5ef6: Merge "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

10 years agoMerge "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"

10 years agoUse 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

10 years agoam 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:40:48 +0000 (08:40 -0800)]
am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE

* commit '5fcebc78b9f6a05ac661dba25acbd354981e9168':
  Import translations. DO NOT MERGE

10 years agoam 879cc42f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 15:46:25 +0000 (07:46 -0800)]
am 879cc42f: (-s ours) Import translations. DO NOT MERGE

* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 04:01:51 +0000 (20:01 -0800)]
Import translations. DO NOT MERGE

Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import

10 years agoam c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 20:13:46 +0000 (12:13 -0800)]
am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE

* commit 'c5e0893521593aaa7dc7089eeaf4f14eac07dad7':
  Import translations. DO NOT MERGE

10 years agoam 233d666a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 20:10:52 +0000 (12:10 -0800)]
am 233d666a: (-s ours) Import translations. DO NOT MERGE

* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 19:47:45 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import

10 years agoam b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
The Android Open Source Project [Fri, 6 Dec 2013 01:25:39 +0000 (17:25 -0800)]
am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD

* commit 'b568548747c9b137d7da05fcdbb84f157273b3db':

10 years agoMerge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD
The Android Open Source Project [Thu, 5 Dec 2013 20:38:23 +0000 (12:38 -0800)]
Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD

10 years agoam 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japan...
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:40:17 +0000 (17:40 -0800)]
am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev

* commit '1f5e66392e4fa01d2686a06044a8f0edfda6310f':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

10 years agoam 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displ...
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:29:27 +0000 (17:29 -0800)]
am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev

* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

10 years agoam 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese...
Lance Chang [Thu, 5 Dec 2013 01:28:36 +0000 (17:28 -0800)]
am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev

* commit '0ea2229b4b39146ed41b99ca0542c73e5305d059':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181

10 years agoMerge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon...
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:27:43 +0000 (01:27 +0000)]
Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev

10 years agoRevert "Fix for formatting of Korean/Japanese text which is displayed upon default...
Lance Jin-woong Chang [Thu, 5 Dec 2013 00:59:51 +0000 (00:59 +0000)]
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

This reverts commit 5796dad9a41e9801878f2cf0feb76977da4b025b.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5

10 years agoam 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed...
Lance Chang [Thu, 5 Dec 2013 00:49:45 +0000 (16:49 -0800)]
am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev

* commit '071fbfd3f35c01fb1c4052614902dabe16af691f':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181

10 years agoMerge "Fix for formatting of Korean/Japanese text which is displayed upon default...
Lance Chang [Thu, 5 Dec 2013 00:47:14 +0000 (00:47 +0000)]
Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev

10 years agoam 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:45:17 +0000 (13:45 -0800)]
am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE

* commit '65c2a2850526802c542ac5a1dee26eab41c33ec3':
  Import translations. DO NOT MERGE

10 years agoam 3c29831e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:42:04 +0000 (13:42 -0800)]
am 3c29831e: (-s ours) Import translations. DO NOT MERGE

* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:28:51 +0000 (13:28 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import

10 years agoam e10f8528: Merge "Fix switching running/cached apps with memory bar"
Amith Yamasani [Wed, 4 Dec 2013 21:05:17 +0000 (13:05 -0800)]
am e10f8528: Merge "Fix switching running/cached apps with memory bar"

* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
  Fix switching running/cached apps with memory bar

10 years agoam f67aa398: Merge "Wrong referring to the resource - id/android:id"
Amith Yamasani [Wed, 4 Dec 2013 21:05:16 +0000 (13:05 -0800)]
am f67aa398: Merge "Wrong referring to the resource - id/android:id"

* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
  Wrong referring to the resource - id/android:id

10 years agoMerge "Fix switching running/cached apps with memory bar"
Amith Yamasani [Wed, 4 Dec 2013 19:17:33 +0000 (19:17 +0000)]
Merge "Fix switching running/cached apps with memory bar"

10 years agoMerge "Wrong referring to the resource - id/android:id"
Amith Yamasani [Wed, 4 Dec 2013 19:05:29 +0000 (19:05 +0000)]
Merge "Wrong referring to the resource - id/android:id"

10 years agoam 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist"...
Amith Yamasani [Tue, 3 Dec 2013 19:38:00 +0000 (11:38 -0800)]
am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev

* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
  Put fragment in specific activity's whitelist

10 years agoam 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
Amith Yamasani [Tue, 3 Dec 2013 19:35:14 +0000 (11:35 -0800)]
am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev

* commit '72a7afb0935264586c821062279d39d8338b1e3d':
  Put fragment in specific activity's whitelist

10 years agoMerge "Put fragment in specific activity's whitelist" into klp-dev
Amith Yamasani [Tue, 3 Dec 2013 19:33:21 +0000 (19:33 +0000)]
Merge "Put fragment in specific activity's whitelist" into klp-dev

10 years agoFix for formatting of Korean/Japanese text which is displayed upon default SMS app...
Lance Chang [Tue, 3 Dec 2013 10:10:43 +0000 (19:10 +0900)]
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181

10 years agoam d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 20:48:22 +0000 (12:48 -0800)]
am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE

* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
  Import translations. DO NOT MERGE

10 years agoam f8e1829c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 20:45:29 +0000 (12:45 -0800)]
am f8e1829c: (-s ours) Import translations. DO NOT MERGE

* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 20:13:18 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE

Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import

10 years agoam fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 20:39:48 +0000 (12:39 -0800)]
am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
  Import translations. DO NOT MERGE

10 years agoam b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 20:36:00 +0000 (12:36 -0800)]
am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 20:18:28 +0000 (12:18 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import

10 years agoam 540d26e8: Merge "Dynamically update connectivity and IP address."
Lorenzo Colitti [Tue, 26 Nov 2013 16:38:50 +0000 (08:38 -0800)]
am 540d26e8: Merge "Dynamically update connectivity and IP address."

* commit '540d26e8449159ebc2d84b8062f20ab4c6337f77':
  Dynamically update connectivity and IP address.

10 years agoam 20ab234f: Merge "Cache preferences and services in status dialog."
Lorenzo Colitti [Tue, 26 Nov 2013 16:38:49 +0000 (08:38 -0800)]
am 20ab234f: Merge "Cache preferences and services in status dialog."

* commit '20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
  Cache preferences and services in status dialog.

10 years agoWrong referring to the resource - id/android:id
Ivan Kovac [Mon, 25 Nov 2013 13:55:21 +0000 (14:55 +0100)]
Wrong referring to the resource - id/android:id

We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/

Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed

10 years agoMerge "Dynamically update connectivity and IP address."
Lorenzo Colitti [Tue, 26 Nov 2013 01:07:24 +0000 (01:07 +0000)]
Merge "Dynamically update connectivity and IP address."

10 years agoMerge "Cache preferences and services in status dialog."
Lorenzo Colitti [Tue, 26 Nov 2013 01:06:38 +0000 (01:06 +0000)]
Merge "Cache preferences and services in status dialog."

10 years agoam c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 20:58:30 +0000 (12:58 -0800)]
am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE

* commit 'c2d1fdac9e7e914d4ecded6016c9056fa250d267':
  Import translations. DO NOT MERGE

10 years agoam d82e8f2b: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 20:55:11 +0000 (12:55 -0800)]
am d82e8f2b: (-s ours) Import translations. DO NOT MERGE

* commit 'd82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:32:22 +0000 (11:32 -0800)]
Import translations. DO NOT MERGE

Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import

10 years agoPut fragment in specific activity's whitelist
Amith Yamasani [Mon, 25 Nov 2013 19:10:00 +0000 (11:10 -0800)]
Put fragment in specific activity's whitelist

Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9

10 years agoDynamically update connectivity and IP address.
Lorenzo Colitti [Fri, 6 Sep 2013 09:04:26 +0000 (18:04 +0900)]
Dynamically update connectivity and IP address.

The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

[Cherry-pick of deb8f08ace7e255939d793c8a5a0006d424734bc]

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c

10 years agoCache preferences and services in status dialog.
Lorenzo Colitti [Thu, 7 Nov 2013 18:53:29 +0000 (03:53 +0900)]
Cache preferences and services in status dialog.

Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

[Cherry-pick of 6eb6a908217e080aea43406028be491d269bdbb0]

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a

10 years agoam ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e\' into HEAD
The Android Open Source Project [Sat, 23 Nov 2013 03:18:34 +0000 (19:18 -0800)]
am ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e\' into HEAD

* commit 'ca99cb71eab502037120cdf68f854c882fcd9e57':

10 years agoMerge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 18:35:36 +0000 (10:35 -0800)]
Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD

10 years agoam 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 22:10:26 +0000 (14:10 -0800)]
am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE

* commit '548614a4e6e0571d5cf06eb5514d0db8fc017d0b':
  Import translations. DO NOT MERGE

10 years agoam c3bd6087: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 22:07:57 +0000 (14:07 -0800)]
am c3bd6087: (-s ours) Import translations. DO NOT MERGE

* commit 'c3bd608799f2239dfa8d739b2732954e4fd658e5':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 20:40:04 +0000 (12:40 -0800)]
Import translations. DO NOT MERGE

Change-Id: I8863a00a23acee9b961b5bf1a0f082ffe5c7b3a1
Auto-generated-cl: translation import

10 years agoam cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:19:50 +0000 (13:19 -0800)]
am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE

* commit 'cd0726f7d824759984a7024826fbfbcaba575400':
  Import translations. DO NOT MERGE

10 years agoam f06ce4eb: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:15:25 +0000 (13:15 -0800)]
am f06ce4eb: (-s ours) Import translations. DO NOT MERGE

* commit 'f06ce4eb9668415c23b16dbd7d8c50702466f8c4':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 19:27:32 +0000 (11:27 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import

10 years agoam 017d2a18: am 130118d4: Add help url for remote display.
Jeff Brown [Tue, 19 Nov 2013 03:09:55 +0000 (19:09 -0800)]
am 017d2a18: am 130118d4: Add help url for remote display.

* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
  Add help url for remote display.

10 years agoam 130118d4: Add help url for remote display.
Jeff Brown [Tue, 19 Nov 2013 03:07:06 +0000 (19:07 -0800)]
am 130118d4: Add help url for remote display.

* commit '130118d43628c058e3bf82f5d978d383f19390de':
  Add help url for remote display.

10 years agoAdd help url for remote display.
Jeff Brown [Mon, 18 Nov 2013 20:26:16 +0000 (12:26 -0800)]
Add help url for remote display.

Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727

10 years agoam 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:18:59 +0000 (11:18 -0800)]
am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE

* commit '6d34b6988b257eb35cd7162d403f6da8114e0b9b':
  Import translations. DO NOT MERGE

10 years agoam 91c54aa8: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:15:12 +0000 (11:15 -0800)]
am 91c54aa8: (-s ours) Import translations. DO NOT MERGE

* commit '91c54aa81849fd60839ac62efb005df390c64438':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:02:58 +0000 (11:02 -0800)]
Import translations. DO NOT MERGE

Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import