PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,888 Commits 1 Branch 0 Tags
1b35e479e64e33dabcc7cdf1825899ab1f7dc61c
Commit Graph

12888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lance Jin-woong Chang
0637c1f909 Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" 
This reverts commit 5796dad9a4.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5
 2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b 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
 2013-12-04 16:49:45 -08:00
Lance Chang
071fbfd3f3 Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 2013-12-05 00:47:16 +00:00
Geoff Mendal
056a3ff646 am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE 
* commit 'bc3c36da789d828e77a9d8baa2211712fe077a47':
  Import translations. DO NOT MERGE
 2013-12-04 21:50:43 +00:00
Geoff Mendal
bc3c36da78 am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE 
* commit '65c2a2850526802c542ac5a1dee26eab41c33ec3':
  Import translations. DO NOT MERGE
 2013-12-04 13:45:17 -08:00
Geoff Mendal
65c2a28505 am 3c29831e: (-s ours) Import translations. DO NOT MERGE 
* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
  Import translations. DO NOT MERGE
 2013-12-04 13:42:04 -08:00
Geoff Mendal
5ce341e206 Merge "Import translations. DO NOT MERGE" 2013-12-04 21:39:45 +00:00
Geoff Mendal
bff561cfd7 Import translations. DO NOT MERGE 
Change-Id: Ib2166418fe68c233b3015b1cab029729abcfcca3
Auto-generated-cl: translation import
 2013-12-04 13:33:47 -08:00
Geoff Mendal
3c29831e87 Import translations. DO NOT MERGE 
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
 2013-12-04 13:28:51 -08:00
Amith Yamasani
eba89f4fae 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
 2013-12-04 21:14:44 +00:00
Amith Yamasani
482b34eaad 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
 2013-12-04 21:14:43 +00:00
Amith Yamasani
5ae0b304a9 am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar" 
* commit 'ff0fad2a0623d29536653f5be13009358fa68fab':
  Fix switching running/cached apps with memory bar
 2013-12-04 21:09:02 +00:00
Amith Yamasani
1cbb539668 am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id" 
* commit '95dd34b4e4570b832b6ae3c028fc448365389298':
  Wrong referring to the resource - id/android:id
 2013-12-04 21:09:01 +00:00
Amith Yamasani
ff0fad2a06 am e10f8528: Merge "Fix switching running/cached apps with memory bar" 
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
  Fix switching running/cached apps with memory bar
 2013-12-04 13:05:17 -08:00
Amith Yamasani
95dd34b4e4 am f67aa398: Merge "Wrong referring to the resource - id/android:id" 
* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
  Wrong referring to the resource - id/android:id
 2013-12-04 13:05:16 -08:00
Amith Yamasani
e10f852822 Merge "Fix switching running/cached apps with memory bar" 2013-12-04 19:17:33 +00:00
Amith Yamasani
f67aa3985d Merge "Wrong referring to the resource - id/android:id" 2013-12-04 19:05:29 +00:00
Amith Yamasani
38bfb392c7 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
 2013-12-03 19:45:49 +00:00
Amith Yamasani
e6e80b195b 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
 2013-12-03 19:42:24 +00:00
Amith Yamasani
ab747c87a9 am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev 
* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
  Put fragment in specific activity's whitelist
 2013-12-03 11:38:00 -08:00
Amith Yamasani
3d6ca11349 am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev 
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
  Put fragment in specific activity's whitelist
 2013-12-03 11:35:14 -08:00
Amith Yamasani
72a7afb093 Merge "Put fragment in specific activity's whitelist" into klp-dev 2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4 Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change 
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-03 19:16:12 +09:00
Geoff Mendal
01b6b40506 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
 2013-12-02 23:31:56 +00:00
Geoff Mendal
da59631e93 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
 2013-12-02 23:30:59 +00:00
Geoff Mendal
c07afc7eab am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit '9d229638eb78fc25a2699fde5ca2f50eeec57040':
  Import translations. DO NOT MERGE
 2013-12-02 20:51:47 +00:00
Geoff Mendal
9d229638eb am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
  Import translations. DO NOT MERGE
 2013-12-02 12:48:22 -08:00
Geoff Mendal
d6ea675c11 am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE
 2013-12-02 12:45:29 -08:00
Geoff Mendal
ddc4bf8dd1 Import translations. DO NOT MERGE 
Change-Id: Ia18b0553100026091fe8f0aaecb3b8c9992c5fc1
Auto-generated-cl: translation import
 2013-12-02 12:18:41 -08:00
Geoff Mendal
f8e1829c99 Import translations. DO NOT MERGE 
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
 2013-12-02 12:13:18 -08:00
Geoff Mendal
0cf4329dbe am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE 
* commit '6bb8844acd5767999a03ae3217a79a7e3be8251b':
  Import translations. DO NOT MERGE
 2013-11-27 20:42:52 +00:00
Geoff Mendal
6bb8844acd am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE 
* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
  Import translations. DO NOT MERGE
 2013-11-27 12:39:48 -08:00
Geoff Mendal
fa1df42735 am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE 
* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
  Import translations. DO NOT MERGE
 2013-11-27 12:36:00 -08:00
Geoff Mendal
d23a1b4563 Import translations. DO NOT MERGE 
Change-Id: Ide520d3a801bcfac862133b6a57e5061cc61f0c9
Auto-generated-cl: translation import
 2013-11-27 12:23:44 -08:00
Geoff Mendal
b8fe3aa2ab Import translations. DO NOT MERGE 
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
 2013-11-27 12:18:28 -08:00
Lorenzo Colitti
2c89052892 am 5613086b: am 540d26e8: Merge "Dynamically update connectivity and IP address." 
* commit '5613086bdb5374fcab59a3b40bb29067b8f583c8':
  Dynamically update connectivity and IP address.
 2013-11-26 15:10:07 -08:00
Lorenzo Colitti
36410f0478 am d393e7cb: (-s ours) am 20ab234f: Merge "Cache preferences and services in status dialog." 
* commit 'd393e7cbab2fb1c94b6885ebd1452be333e7130f':
  Cache preferences and services in status dialog.
 2013-11-26 15:10:06 -08:00
William Luh
7640cf6db2 Merge "Add event logging for device admin." 2013-11-26 22:06:18 +00:00
Lorenzo Colitti
5613086bdb am 540d26e8: Merge "Dynamically update connectivity and IP address." 
* commit '540d26e8449159ebc2d84b8062f20ab4c6337f77':
  Dynamically update connectivity and IP address.
 2013-11-26 08:38:50 -08:00
Lorenzo Colitti
d393e7cbab am 20ab234f: Merge "Cache preferences and services in status dialog." 
* commit '20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
  Cache preferences and services in status dialog.
 2013-11-26 08:38:49 -08:00
Ivan Kovac
14c81b48f7 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
 2013-11-26 12:42:24 +01:00
Lorenzo Colitti
540d26e844 Merge "Dynamically update connectivity and IP address." 2013-11-26 01:07:25 +00:00
Lorenzo Colitti
20ab234f3d Merge "Cache preferences and services in status dialog." 2013-11-26 01:06:38 +00:00
Geoff Mendal
aadd6e516a am 5f87bb02: (-s ours) am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE 
* commit '5f87bb027ce5799ce88da15f88ca4b4f36f88007':
  Import translations. DO NOT MERGE
 2013-11-25 13:04:44 -08:00
Geoff Mendal
5f87bb027c am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE 
* commit 'c2d1fdac9e7e914d4ecded6016c9056fa250d267':
  Import translations. DO NOT MERGE
 2013-11-25 12:58:30 -08:00
Geoff Mendal
c2d1fdac9e am d82e8f2b: (-s ours) Import translations. DO NOT MERGE 
* commit 'd82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
  Import translations. DO NOT MERGE
 2013-11-25 12:55:11 -08:00
Geoff Mendal
f2ae37b3d4 Import translations. DO NOT MERGE 
Change-Id: I48e17ae0556e58091a408a23a393c9b05a87fcc8
Auto-generated-cl: translation import
 2013-11-25 11:37:02 -08:00
Geoff Mendal
d82e8f2bec Import translations. DO NOT MERGE 
Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import
 2013-11-25 11:32:22 -08:00
Amith Yamasani
a88bdd34f7 Put fragment in specific activity's whitelist 
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
 2013-11-25 11:10:00 -08:00
Lorenzo Colitti
5448b25481 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 deb8f08ace]

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
 2013-11-25 17:34:45 +09:00