OSDN Git Service
Dianne Hackborn [Thu, 5 Dec 2013 22:45:23 +0000 (22:45 +0000)]
am
bcecc4a7: (-s ours) am
b690af54: am
f3796d0b: Merge "Improve process stats UI." into klp-dev
* commit '
bcecc4a7f89ba9951d41fb46dd0c63c078cd66c4':
Alan Viverette [Thu, 5 Dec 2013 22:45:23 +0000 (22:45 +0000)]
am
418d1df7: (-s ours) am
85c37e78: am
c0f79432: Merge "Update captioning settings to match final design" into klp-dev
* commit '
418d1df7272f6ed9c332d4683205306ebeb7c731':
Amith Yamasani [Thu, 5 Dec 2013 22:45:22 +0000 (22:45 +0000)]
am
391e601a: (-s ours) am
d04e36e6: am
2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
* commit '
391e601ae2d7900ef598eb7d4903bbdde545afb1':
Amith Yamasani [Thu, 5 Dec 2013 22:45:21 +0000 (22:45 +0000)]
am
962c7f87: (-s ours) am
1eb6105f: am
a42cacb3: Merge "Potential fix for Bug:
10241642" into klp-dev
* commit '
962c7f874ac3eedf7d60bba0c559cea6240ab5ba':
Dianne Hackborn [Thu, 5 Dec 2013 22:45:20 +0000 (22:45 +0000)]
am
8c01ad1e: (-s ours) am
cd20ebcc: am
c6d658e3: Initial rough stab at a proc stats UI.
* commit '
8c01ad1ec8d4d48f0cd47f5858e8d6299eb991d2':
Baligh Uddin [Thu, 5 Dec 2013 22:45:19 +0000 (22:45 +0000)]
am
8be6770c: (-s ours) am
921a3144: (-s ours) am
dcd15ee0: (-s ours) am
7256942b: (-s ours) am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
8be6770c4edb11ea3784a193d37339251b06902b':
The Android Open Source Project [Thu, 5 Dec 2013 22:45:18 +0000 (22:45 +0000)]
am
c3835eae: (-s ours) am
8c1845a6: (-s ours) am
76cbd841: am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
c3835eae2336e3d42e28f0a8c712238e4fe12701':
Baligh Uddin [Thu, 5 Dec 2013 22:45:17 +0000 (22:45 +0000)]
am
bf3d3f8f: (-s ours) am
c7891c6c: (-s ours) am
ff2aed99: (-s ours) am
b4d720f9: (-s ours) am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
bf3d3f8fd015a834aaf54051cef1805f0b4a241f':
Amith Yamasani [Thu, 5 Dec 2013 22:45:16 +0000 (22:45 +0000)]
am
436e4fd4: (-s ours) am
05e2459f: am
82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev
* commit '
436e4fd49f4ec5728bb7e7b65e7b14c80b8f698c':
David Christie [Thu, 5 Dec 2013 22:45:15 +0000 (22:45 +0000)]
am
7fcc1d73: (-s ours) am
aba6eb64: am
b8fa4d9f: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
* commit '
7fcc1d733fe617ffbb463443058215c510024cae':
Svetoslav [Thu, 5 Dec 2013 22:45:14 +0000 (22:45 +0000)]
am
0e001877: (-s ours) am
0427cb67: am
3f257c4d: Fix a crash in accessibiility settings.
* commit '
0e001877d3485d39d6f436c7ec4a6308d343fa93':
Lifu Tang [Thu, 5 Dec 2013 22:45:13 +0000 (22:45 +0000)]
am
fb2b5cd9: (-s ours) am
098061c2: am
88afb32f: Displays a list of most recent location apps
* commit '
fb2b5cd951be02e8694d23b9dd9a832cd83bd960':
Lifu Tang [Thu, 5 Dec 2013 22:45:12 +0000 (22:45 +0000)]
am
cd412600: (-s ours) am
7b449db2: am
b14698ee: Merge "Finished the location settings"
* commit '
cd4126005dd7ef8808171c07df07ebb149170d1e':
Jason Monk [Thu, 5 Dec 2013 22:45:11 +0000 (22:45 +0000)]
am
92d5dd36: (-s ours) am
49d6f604: am
71decb7b: Merge "Restriction pin changes."
* commit '
92d5dd36f4445ee386560582514934135c9f98bd':
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':
Dianne Hackborn [Thu, 5 Dec 2013 19:40:13 +0000 (19:40 +0000)]
am
b690af54: am
f3796d0b: Merge "Improve process stats UI." into klp-dev
* commit '
b690af54dc0c5e82d15226c5a85be713bcd25db2':
Alan Viverette [Thu, 5 Dec 2013 19:40:12 +0000 (19:40 +0000)]
am
85c37e78: am
c0f79432: Merge "Update captioning settings to match final design" into klp-dev
* commit '
85c37e78b5bb21788ce3edb42363e550895cd9fc':
Amith Yamasani [Thu, 5 Dec 2013 19:37:05 +0000 (19:37 +0000)]
am
d04e36e6: am
2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
* commit '
d04e36e6f2259747dac4c4a1fa0393f72dc078af':
Alan Viverette [Thu, 5 Dec 2013 19:33:52 +0000 (19:33 +0000)]
Merge "Add preference for caption text opacity"
Amith Yamasani [Thu, 5 Dec 2013 19:33:28 +0000 (19:33 +0000)]
am
1eb6105f: am
a42cacb3: Merge "Potential fix for Bug:
10241642" into klp-dev
* commit '
1eb6105f25dcecde565f9d56e5c87feed7bd520d':
Dianne Hackborn [Thu, 5 Dec 2013 19:33:06 +0000 (19:33 +0000)]
am
cd20ebcc: am
c6d658e3: Initial rough stab at a proc stats UI.
* commit '
cd20ebcc8c0261765fa8e6de57df3f72062c710e':
Alan Viverette [Thu, 5 Dec 2013 19:27:40 +0000 (11:27 -0800)]
Add preference for caption text opacity
BUG:
11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
Baligh Uddin [Thu, 5 Dec 2013 19:21:36 +0000 (19:21 +0000)]
am
921a3144: (-s ours) am
dcd15ee0: (-s ours) am
7256942b: (-s ours) am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
921a3144a06496acfb06b512e443473141056304':
The Android Open Source Project [Thu, 5 Dec 2013 19:21:35 +0000 (19:21 +0000)]
am
8c1845a6: (-s ours) am
76cbd841: am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
8c1845a6d669b03c2827965042f2e47e49f2d6b1':
Baligh Uddin [Thu, 5 Dec 2013 19:21:34 +0000 (19:21 +0000)]
am
c7891c6c: (-s ours) am
ff2aed99: (-s ours) am
b4d720f9: (-s ours) am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
c7891c6c8d309710a4b948ad2084e43bcd7ebe5c':
Amith Yamasani [Thu, 5 Dec 2013 19:21:33 +0000 (19:21 +0000)]
am
05e2459f: am
82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev
* commit '
05e2459fb85848b19362554a7ffeb2e9b50da720':
David Christie [Thu, 5 Dec 2013 19:21:32 +0000 (19:21 +0000)]
am
aba6eb64: am
b8fa4d9f: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
* commit '
aba6eb64633e7957afe036a5d7c506b9c059ec3e':
Svetoslav [Thu, 5 Dec 2013 19:21:31 +0000 (19:21 +0000)]
am
0427cb67: am
3f257c4d: Fix a crash in accessibiility settings.
* commit '
0427cb67d1545d38859e6522905b4a78d82bacc7':
Lifu Tang [Thu, 5 Dec 2013 19:21:30 +0000 (19:21 +0000)]
am
098061c2: am
88afb32f: Displays a list of most recent location apps
* commit '
098061c2022164e169ec40e6114b48dd5bfcaff2':
Lifu Tang [Thu, 5 Dec 2013 19:21:28 +0000 (19:21 +0000)]
am
7b449db2: am
b14698ee: Merge "Finished the location settings"
* commit '
7b449db21ecae05f95355544936bd840a89601c7':
Jason Monk [Thu, 5 Dec 2013 19:21:27 +0000 (19:21 +0000)]
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':
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"
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
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
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"
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"
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
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"
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
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
Alan Viverette [Thu, 5 Dec 2013 01:19:54 +0000 (01:19 +0000)]
Merge "Remove 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
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
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
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
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
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
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
Geoff Mendal [Wed, 4 Dec 2013 21:39:45 +0000 (21:39 +0000)]
Merge "Import 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
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
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
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
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
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
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
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
Amith Yamasani [Wed, 4 Dec 2013 19:17:33 +0000 (19:17 +0000)]
Merge "Fix switching running/cached apps with memory bar"
Amith Yamasani [Wed, 4 Dec 2013 19:05:29 +0000 (19:05 +0000)]
Merge "Wrong referring to the resource - id/android:id"
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
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
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
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
Amith Yamasani [Tue, 3 Dec 2013 19:33:21 +0000 (19:33 +0000)]
Merge "Put fragment in specific activity's whitelist" into klp-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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.
William Luh [Tue, 26 Nov 2013 22:06:17 +0000 (22:06 +0000)]
Merge "Add event logging for device admin."
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.
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.
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
Lorenzo Colitti [Tue, 26 Nov 2013 01:07:24 +0000 (01:07 +0000)]
Merge "Dynamically update connectivity and IP address."
Lorenzo Colitti [Tue, 26 Nov 2013 01:06:38 +0000 (01:06 +0000)]
Merge "Cache preferences and services in status dialog."
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
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
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
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
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
Amith Yamasani [Mon, 25 Nov 2013 19:10:00 +0000 (11:10 -0800)]
Put fragment in specific activity's whitelist
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
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
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
The Android Open Source Project [Sat, 23 Nov 2013 20:29:50 +0000 (12:29 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 03:18:34 +0000 (19:18 -0800)]
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
The Android Open Source Project [Fri, 22 Nov 2013 18:35:36 +0000 (10:35 -0800)]
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
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