OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam e9529fe6: (-s ours) am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import...
Baligh Uddin [Thu, 5 Dec 2013 22:45:10 +0000 (22:45 +0000)]
am e9529fe6: (-s ours) am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'e9529fe6cd7e0c8d3d6faad1b6db9c0d105ea702':

10 years agoMerge "Add preference for caption text opacity"
Alan Viverette [Thu, 5 Dec 2013 19:33:52 +0000 (19:33 +0000)]
Merge "Add preference for caption text opacity"

10 years agoAdd preference for caption text opacity
Alan Viverette [Thu, 5 Dec 2013 19:27:40 +0000 (11:27 -0800)]
Add preference for caption text opacity

BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59

10 years agoam dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 5 Dec 2013 19:21:26 +0000 (19:21 +0000)]
am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':

10 years agoam 76cd835e: am e161f873: am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix...
Lance Jin-woong Chang [Thu, 5 Dec 2013 02:45:37 +0000 (02:45 +0000)]
am 76cd835e: am e161f873: 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 '76cd835e76d42ca60cea7ecdfa0d772a2f95ed6e':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

10 years agoam 31507e29: am 6d039786: am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatti...
Lance Chang [Thu, 5 Dec 2013 02:45:34 +0000 (02:45 +0000)]
am 31507e29: am 6d039786: 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 '31507e290dcd20390c5fc25f1bd01a76772899e3':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181

10 years agoam 056a3ff6: (-s ours) am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e...
Geoff Mendal [Thu, 5 Dec 2013 02:45:06 +0000 (02:45 +0000)]
am 056a3ff6: (-s ours) am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE

* commit '056a3ff6460d4a893fc9e1bc1ef17596f16c1d68':
  Import translations. DO NOT MERGE

10 years agoam e161f873: am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting...
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:43:56 +0000 (01:43 +0000)]
am e161f873: 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 'e161f8733e816ac83e5d6823d5e958372395e94b':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

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 6d039786: am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean...
Lance Chang [Thu, 5 Dec 2013 01:31:51 +0000 (01:31 +0000)]
am 6d039786: 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 '6d0397864a1933a869553f500fa09536bbcb3c52':
  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 agoMerge "Remove extra fragment in captioning preferences"
Alan Viverette [Thu, 5 Dec 2013 01:19:54 +0000 (01:19 +0000)]
Merge "Remove extra fragment in captioning preferences"

10 years agoRemove extra fragment in captioning preferences
Alan Viverette [Thu, 5 Dec 2013 01:19:24 +0000 (17:19 -0800)]
Remove extra fragment in captioning preferences

BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac

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 bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translati...
Geoff Mendal [Wed, 4 Dec 2013 21:50:43 +0000 (21:50 +0000)]
am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE

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

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 agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Dec 2013 21:39:45 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE"

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

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

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 5ae0b304: am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with...
Amith Yamasani [Wed, 4 Dec 2013 21:14:44 +0000 (21:14 +0000)]
am 5ae0b304: am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"

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

10 years agoam 1cbb5396: am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id...
Amith Yamasani [Wed, 4 Dec 2013 21:14:43 +0000 (21:14 +0000)]
am 1cbb5396: am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"

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

10 years agoam ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"
Amith Yamasani [Wed, 4 Dec 2013 21:09:02 +0000 (21:09 +0000)]
am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"

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

10 years agoam 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"
Amith Yamasani [Wed, 4 Dec 2013 21:09:01 +0000 (21:09 +0000)]
am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"

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

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 e6e80b19: am ab747c87: am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific...
Amith Yamasani [Tue, 3 Dec 2013 19:45:49 +0000 (19:45 +0000)]
am e6e80b19: am ab747c87: am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev

* commit 'e6e80b195b011c074241cbae4325f713190fa196':
  Put fragment in specific activity's whitelist

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

* commit 'ab747c87a94648cb703f797e4a206b9ef9042772':
  Put fragment in specific activity's whitelist

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 c07afc7e: (-s ours) am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c...
Geoff Mendal [Mon, 2 Dec 2013 23:31:56 +0000 (23:31 +0000)]
am c07afc7e: (-s ours) am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 0cf4329d: (-s ours) am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2...
Geoff Mendal [Mon, 2 Dec 2013 23:30:59 +0000 (23:30 +0000)]
am 0cf4329d: (-s ours) am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit '0cf4329dbedbae2a3511d2456ddf50de9c039033':
  Import translations. DO NOT MERGE

10 years agoam 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translati...
Geoff Mendal [Mon, 2 Dec 2013 20:51:47 +0000 (20:51 +0000)]
am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE

* commit '9d229638eb78fc25a2699fde5ca2f50eeec57040':
  Import translations. DO NOT MERGE

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:18:41 +0000 (12:18 -0800)]
Import translations. DO NOT MERGE

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

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 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translati...
Geoff Mendal [Wed, 27 Nov 2013 20:42:52 +0000 (20:42 +0000)]
am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

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

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:23:44 +0000 (12:23 -0800)]
Import translations. DO NOT MERGE

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

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 5613086b: am 540d26e8: Merge "Dynamically update connectivity and IP address."
Lorenzo Colitti [Tue, 26 Nov 2013 23:10:07 +0000 (15:10 -0800)]
am 5613086b: am 540d26e8: Merge "Dynamically update connectivity and IP address."

* commit '5613086bdb5374fcab59a3b40bb29067b8f583c8':
  Dynamically update connectivity and IP address.

10 years agoam d393e7cb: (-s ours) am 20ab234f: Merge "Cache preferences and services in status...
Lorenzo Colitti [Tue, 26 Nov 2013 23:10:06 +0000 (15:10 -0800)]
am d393e7cb: (-s ours) am 20ab234f: Merge "Cache preferences and services in status dialog."

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

10 years agoMerge "Add event logging for device admin."
William Luh [Tue, 26 Nov 2013 22:06:17 +0000 (22:06 +0000)]
Merge "Add event logging for device admin."

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 5f87bb02: (-s ours) am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translati...
Geoff Mendal [Mon, 25 Nov 2013 21:04:44 +0000 (13:04 -0800)]
am 5f87bb02: (-s ours) am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE

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

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:37:02 +0000 (11:37 -0800)]
Import translations. DO NOT MERGE

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

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 6a1d96e7: am ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e...
The Android Open Source Project [Sat, 23 Nov 2013 20:29:50 +0000 (12:29 -0800)]
am 6a1d96e7: am ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e\' into HEAD

* commit '6a1d96e710f155b148c60cecce5c6beae1d02db1':

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 agoAdd event logging for device admin.
William Luh [Fri, 22 Nov 2013 23:42:40 +0000 (15:42 -0800)]
Add event logging for device admin.

This allows us to gather metrics about unwanted device admin apps. User consent from Verify Apps is required.

Bug: 11253927
Change-Id: I449929772f63f426426f7726d3d21e7c1512e6ce

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 62d814f9: (-s ours) am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translati...
Geoff Mendal [Thu, 21 Nov 2013 22:12:21 +0000 (14:12 -0800)]
am 62d814f9: (-s ours) am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE

* commit '62d814f9b449b054b33db9587bc9764267571c17':
  Import translations. DO NOT MERGE

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:45:53 +0000 (12:45 -0800)]
Import translations. DO NOT MERGE

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

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 e178a756: (-s ours) am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translati...
Baligh Uddin [Wed, 20 Nov 2013 21:24:13 +0000 (13:24 -0800)]
am e178a756: (-s ours) am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE

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

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:33:22 +0000 (11:33 -0800)]
Import translations. DO NOT MERGE

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

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 169e8a0c: am 017d2a18: am 130118d4: Add help url for remote display.
Jeff Brown [Tue, 19 Nov 2013 03:13:24 +0000 (19:13 -0800)]
am 169e8a0c: am 017d2a18: am 130118d4: Add help url for remote display.

* commit '169e8a0c2aee26731a847a46954d95a78161ecd8':
  Add help url for remote display.

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 f9ca318a: (-s ours) am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translati...
Baligh Uddin [Mon, 18 Nov 2013 19:21:32 +0000 (11:21 -0800)]
am f9ca318a: (-s ours) am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE

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

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:09:45 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE

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

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

10 years agoam 5569a8f4: am 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid. We have alread...
Baligh Uddin [Fri, 15 Nov 2013 20:03:39 +0000 (12:03 -0800)]
am 5569a8f4: am 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev

* commit '5569a8f48c742aa2aded408d0b3e8de7a0cba172':
  Remove hardcoded msgid.  We have already leveraged in TC.

10 years agoam 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged...
Baligh Uddin [Fri, 15 Nov 2013 19:59:35 +0000 (11:59 -0800)]
am 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev

* commit '9c8a463c3005d8b3d96bde28ecc00a5b2788d9e3':
  Remove hardcoded msgid.  We have already leveraged in TC.

10 years agoam beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into...
Baligh Uddin [Fri, 15 Nov 2013 19:56:55 +0000 (11:56 -0800)]
am beb9a03b: Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev

* commit 'beb9a03b716d152ea25813fca3a93a1ec781a685':
  Remove hardcoded msgid.  We have already leveraged in TC.

10 years agoMerge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
Baligh Uddin [Fri, 15 Nov 2013 19:52:40 +0000 (19:52 +0000)]
Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev

10 years agoam 5d3dd3a1: (-s ours) am 72d674af: (-s ours) am ebf21489: (-s ours) Import translati...
Baligh Uddin [Fri, 15 Nov 2013 19:50:14 +0000 (11:50 -0800)]
am 5d3dd3a1: (-s ours) am 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:46:33 +0000 (11:46 -0800)]
am 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE

* commit '72d674af97df6f964f217ad7eddec7ea58612114':
  Import translations. DO NOT MERGE

10 years agoam ebf21489: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:42:56 +0000 (11:42 -0800)]
am ebf21489: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:31:33 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE

bug:11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 15 Nov 2013 19:27:36 +0000 (19:27 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoRemove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:21:11 +0000 (11:21 -0800)]
Remove hardcoded msgid.  We have already leveraged in TC.

bug:11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871

10 years agoam 8f9d4e32: (-s ours) am 67a0472f: (-s ours) am 503b6def: (-s ours) Import translati...
Baligh Uddin [Fri, 15 Nov 2013 19:19:15 +0000 (11:19 -0800)]
am 8f9d4e32: (-s ours) am 67a0472f: (-s ours) am 503b6def: (-s ours) Import translations. DO NOT MERGE

* commit '8f9d4e323118fefcf418b6019eaeaf880b1d6d12':
  Import translations. DO NOT MERGE