OSDN Git Service
Satoshi Kataoka [Fri, 18 Oct 2013 18:24:03 +0000 (11:24 -0700)]
am
544db7fa: (-s ours) am
56f47bf1: am
ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
* commit '
544db7fad02457d96ae0d69fb458cf7c10f03b1c':
Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 18:21:32 +0000 (11:21 -0700)]
am
56f47bf1: am
ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
* commit '
56f47bf11bb041eff3333c9047a6ebef5d50a59e':
Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 18:18:29 +0000 (11:18 -0700)]
am
ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
* commit '
ea90cd2fca08e5c65e54d8df1c208337e08fc541':
Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 07:57:57 +0000 (16:57 +0900)]
Do not merge. Refresh "InputMethodPreference"s onResume
Corresponding change is I015075d57ebed94d6b
Bug:
11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7
Satoshi Kataoka [Fri, 18 Oct 2013 07:57:57 +0000 (16:57 +0900)]
Refresh "InputMethodPreference"s onResume
Bug:
11245599
Change-Id: I015075d57ebed94d6b76a66de135ee748e27e3a6
Baligh Uddin [Thu, 17 Oct 2013 21:40:48 +0000 (14:40 -0700)]
am
e9e80ada: (-s ours) am
3796a55e: (-s ours) am
2496a32c: (-s ours) Import translations. DO NOT MERGE
* commit '
e9e80ada85bb124df6b9ede805a349e345a84bb3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:33:37 +0000 (14:33 -0700)]
am
3796a55e: (-s ours) am
2496a32c: (-s ours) Import translations. DO NOT MERGE
* commit '
3796a55ed221dd4e3c5eda1fc1699c539b2dd54d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:31:54 +0000 (14:31 -0700)]
am
2496a32c: (-s ours) Import translations. DO NOT MERGE
* commit '
2496a32ca67270e5570f97b780ae47aade080e0d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:30:00 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41a338eda7e5ea66266315fab7808b0b04ec3ed9
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 21:21:57 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 17:28:56 +0000 (10:28 -0700)]
am
fba7df30: (-s ours) am
2fa95373: (-s ours) am
025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
fba7df3034a3470b32e01653dfad0aca200ac3ae':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:27:16 +0000 (10:27 -0700)]
am
2fa95373: (-s ours) am
025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2fa95373a5b8f7e2753f396240cad9f2615d3b3e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:25:29 +0000 (10:25 -0700)]
am
025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
025b6ecff220b3117b892df1d9f4bd35a4fb4527':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:21:38 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Oct 2013 17:21:34 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 17 Oct 2013 06:18:02 +0000 (23:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb0c8c8555ee014dbab39fab6d9f19442eb28410
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 06:13:11 +0000 (23:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I837e1a31e3443781597b7de28f44fc332c6a84fd
Auto-generated-cl: translation import
Zhihai Xu [Thu, 17 Oct 2013 02:35:03 +0000 (19:35 -0700)]
am
e7f63626: am
820e7010: am
3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
e7f636264b769918ca46148f1db1038d1cd84830':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Thu, 17 Oct 2013 02:31:52 +0000 (19:31 -0700)]
am
820e7010: am
3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
820e70102e61e290a59ad545f42fac4336aa4e9c':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Thu, 17 Oct 2013 02:29:49 +0000 (19:29 -0700)]
am
3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
3f90a454480c227e58300f8c6fb88cc022ff237e':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Thu, 17 Oct 2013 02:27:10 +0000 (02:27 +0000)]
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 01:02:13 +0000 (18:02 -0700)]
am
bc6aa63a: am
5af7e568: am
67390aad: merge in klp-release (no-op)
* commit '
bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e':
updated launcher settings icon to gray gear
Load account type icons in a background thread before scrolling down
Updated de-blued backgrounds for settings power widget.
Add print job settings screen.
Ed Heyl [Thu, 17 Oct 2013 00:56:40 +0000 (17:56 -0700)]
am
5af7e568: am
67390aad: merge in klp-release (no-op)
* commit '
5af7e568115097a6759f6bfc11620690944381c8':
updated launcher settings icon to gray gear
Load account type icons in a background thread before scrolling down
Updated de-blued backgrounds for settings power widget.
Add print job settings screen.
Ed Heyl [Thu, 17 Oct 2013 00:52:06 +0000 (17:52 -0700)]
am
67390aad: merge in klp-release (no-op)
* commit '
67390aad4f8a091dc14ea825ede292f8a52efb47':
updated launcher settings icon to gray gear
Load account type icons in a background thread before scrolling down
Updated de-blued backgrounds for settings power widget.
Add print job settings screen.
Ed Heyl [Thu, 17 Oct 2013 00:46:24 +0000 (17:46 -0700)]
merge in klp-release (no-op)
Christopher Tate [Wed, 16 Oct 2013 20:46:45 +0000 (13:46 -0700)]
am
06c0a90d: am
a31d8b71: am
235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
* commit '
06c0a90d7805a8fdce4156af839a6e4d14b33702':
User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:43:46 +0000 (13:43 -0700)]
am
a31d8b71: am
235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
* commit '
a31d8b7194793a2ef01f36bd07d70043762de02e':
User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:41:43 +0000 (13:41 -0700)]
am
235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
* commit '
235e5d686fc73cfd82605bac86dcc9673916c5b7':
User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:24:36 +0000 (13:24 -0700)]
User ID, not uid, in an EXTRA_USER_HANDLE
Bug
11208808
Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9
Zhihai Xu [Tue, 15 Oct 2013 18:27:54 +0000 (11:27 -0700)]
BT keeps on asking me if I want to allow car to do stuff
remember how many time the user choose the "no",
if user choose "no" twice, we will make it persist.
bug:
11176511
Change-Id: I7234e7b4ba4586065dea462029e2da5ddaf53316
The Android Automerger [Tue, 15 Oct 2013 13:01:17 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Torne (Richard Coles) [Tue, 15 Oct 2013 12:37:35 +0000 (13:37 +0100)]
Resolved conflicts for merge of
67e72aa4 to master
Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396
Torne (Richard Coles) [Tue, 15 Oct 2013 10:37:07 +0000 (03:37 -0700)]
am
9880646e: am
f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit '
9880646e197331b99ba9824b7d47f12391c82bf4':
Remove experimental WebView setting.
Torne (Richard Coles) [Tue, 15 Oct 2013 10:34:15 +0000 (03:34 -0700)]
am
f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit '
f88e5442f5d2492d415864d1cd118d610b0005d0':
Remove experimental WebView setting.
Torne (Richard Coles) [Tue, 15 Oct 2013 10:31:46 +0000 (10:31 +0000)]
Merge "Remove experimental WebView setting." into klp-dev
Baligh Uddin [Tue, 15 Oct 2013 03:01:30 +0000 (20:01 -0700)]
am
81d0f1b9: (-s ours) am
9f9a9652: (-s ours) am
740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '
81d0f1b93c9e1be59546a5efa875202378efacbe':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Oct 2013 02:01:01 +0000 (19:01 -0700)]
am
9f9a9652: (-s ours) am
740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '
9f9a9652099204c2e15f1c1660e6886162932943':
Import translations. DO NOT MERGE
Yuhao Zheng [Tue, 15 Oct 2013 00:25:28 +0000 (00:25 +0000)]
Merge "Refresh peer list when entering wifi p2p settings"
Baligh Uddin [Tue, 15 Oct 2013 00:19:28 +0000 (17:19 -0700)]
am
740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '
740702ced3d69f3c0b8208ace86e88e4a76ccba0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 22:54:01 +0000 (22:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 14 Oct 2013 22:30:24 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If06a2397c8b907b0593374a89ad2d22bc53382c1
Auto-generated-cl: translation import
Baligh Uddin [Mon, 14 Oct 2013 22:24:56 +0000 (15:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import
Baligh Uddin [Mon, 14 Oct 2013 17:50:16 +0000 (10:50 -0700)]
am
ce4a93f3: (-s ours) am
fea253e0: (-s ours) am
37473121: (-s ours) Import translations. DO NOT MERGE
* commit '
ce4a93f3f4c8ef5c8f2b099f667ad41bcce2e3d2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 17:48:34 +0000 (10:48 -0700)]
am
d7e8a7f8: (-s ours) am
84c377f5: (-s ours) am
9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '
d7e8a7f813376e0e33e9be4031047ec5ae0c8eb4':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 17:48:34 +0000 (10:48 -0700)]
am
7508ef29: (-s ours) am
8dd824b6: (-s ours) Import translations. DO NOT MERGE
* commit '
7508ef29dc4fd823048a3dfc4053a0dea2191c5c':
Import translations. DO NOT MERGE
Torne (Richard Coles) [Mon, 14 Oct 2013 16:35:43 +0000 (17:35 +0100)]
Remove experimental WebView setting.
The experimental WebView is no longer experimental; remove the setting
from the settings app.
Bug:
10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
The Android Automerger [Sun, 13 Oct 2013 13:02:42 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Baligh Uddin [Sat, 12 Oct 2013 13:46:01 +0000 (06:46 -0700)]
am
fea253e0: (-s ours) am
37473121: (-s ours) Import translations. DO NOT MERGE
* commit '
fea253e00a835ed876211dba9d0f37edc9f162e9':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 13:43:48 +0000 (06:43 -0700)]
am
37473121: (-s ours) Import translations. DO NOT MERGE
* commit '
37473121937ad62b616e849e21954cf39583e465':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 07:59:55 +0000 (00:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61a6ed38ca7f23682f15d452b199e57f3dc4b632
Auto-generated-cl: translation import
Baligh Uddin [Sat, 12 Oct 2013 07:56:01 +0000 (00:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 22:03:27 +0000 (15:03 -0700)]
am
84c377f5: (-s ours) am
9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '
84c377f51a0995b2f70028df12abb9f98c44e915':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 22:03:26 +0000 (15:03 -0700)]
am
8dd824b6: (-s ours) Import translations. DO NOT MERGE
* commit '
8dd824b60b9345df7409bbd35e1b9ff7b3b051e6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 22:01:27 +0000 (15:01 -0700)]
am
9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '
9c861f80a2f87d007c7bce7493a154d33702f785':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 21:56:37 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa7a23156b38840d7807de126a8eb3d556ac95ff
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 21:51:44 +0000 (14:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 21:47:56 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import
Zhihai Xu [Fri, 11 Oct 2013 21:13:33 +0000 (14:13 -0700)]
am
c326942d: am
cf71c2d3: am
83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
c326942dfd68ee60b8b0c9f244c8e3c1798b48e1':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 11 Oct 2013 21:10:13 +0000 (14:10 -0700)]
am
cf71c2d3: am
83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
cf71c2d3e31375fa68fd65f1ec39fcce62a4b4c3':
BT keeps on asking me if I want to allow car to do stuff
Yuhao Zheng [Fri, 11 Oct 2013 20:56:24 +0000 (13:56 -0700)]
Refresh peer list when entering wifi p2p settings
When wifi p2p is connected, entering Wi-Fi Direct UI won't show any peer devices
until a WIFI_P2P_PEERS_CHANGED_ACTION broadcast is received (long after or never).
Users may be confused and think p2p is disconnected. It's more user friendly to
display connected devices right at the beginning.
In addition, this CL removes the useless mWifiP2pManager.requestGroupInfo call.
Bug:
11175553
Change-Id: I0f0834043a2cf6e8fc20319e6861b62484478146
Zhihai Xu [Fri, 11 Oct 2013 21:06:13 +0000 (14:06 -0700)]
am
83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
83936d967d0e880401843161feda649c5bd96bc1':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 11 Oct 2013 21:02:51 +0000 (21:02 +0000)]
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
Dianne Hackborn [Fri, 11 Oct 2013 19:55:04 +0000 (12:55 -0700)]
am
47be2e84: am
4f00b368: am
b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '
47be2e84d0b0f603357646ae18a2bc39b8b148cf':
Allow tapping on memory status regions to filter proc stats.
Dianne Hackborn [Fri, 11 Oct 2013 19:50:07 +0000 (12:50 -0700)]
am
4f00b368: am
b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '
4f00b368f9fcc27d43dfc63c3ac9d6fedf8a070d':
Allow tapping on memory status regions to filter proc stats.
Zhihai Xu [Fri, 11 Oct 2013 19:15:19 +0000 (12:15 -0700)]
BT keeps on asking me if I want to allow car to do stuff
We can remember it as a non persist global value when user click no.
This value won't be saved when power down.
We will restore the permission choice
when we are disconnected with the remote device.
So the "no" choice selected by user will only take effect
until we are disconnected with the remote device.
bug:
11176511
Change-Id: Ic0c0829587cf7a812b5fa96fbd381921f67c186f
Dianne Hackborn [Fri, 11 Oct 2013 18:59:51 +0000 (11:59 -0700)]
am
b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '
b1e33884190732a58bfbfe659898e02d41fe39f4':
Allow tapping on memory status regions to filter proc stats.
Dianne Hackborn [Fri, 11 Oct 2013 18:50:34 +0000 (11:50 -0700)]
Allow tapping on memory status regions to filter proc stats.
Change-Id: Iade56907df648a95600919578154635c49ac9dce
Yuhao Zheng [Fri, 11 Oct 2013 18:38:09 +0000 (18:38 +0000)]
Merge "Wi-Fi Direct setting UI: handle p2p disable state"
Baligh Uddin [Fri, 11 Oct 2013 15:37:18 +0000 (08:37 -0700)]
am
b13b7995: (-s ours) am
bcdb5eec: (-s ours) am
6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit '
b13b7995884570bbc3f24ac6e15d6fcc72bd7d4d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 15:30:50 +0000 (08:30 -0700)]
am
bcdb5eec: (-s ours) am
6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit '
bcdb5eec863be4b46b608bda586c889760afba0a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 15:30:09 +0000 (08:30 -0700)]
am
672c00c3: (-s ours) am
3104c1ce: (-s ours) Import translations. DO NOT MERGE
* commit '
672c00c34b1494d6681d414b4ca4a6ca0b18ad64':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 15:27:19 +0000 (08:27 -0700)]
am
6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit '
6e96aff5546f02199cf4c8aba0bae132d7d35e43':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 15:27:07 +0000 (08:27 -0700)]
am
3104c1ce: (-s ours) Import translations. DO NOT MERGE
* commit '
3104c1ce9fd8e06e5c380898b1e9f017825c996a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 15:22:45 +0000 (15:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 11 Oct 2013 08:22:14 +0000 (01:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ef84bf546ddd4be1daa67e14bf5152a4bf2b381
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 08:17:11 +0000 (01:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I227ca980e6c3ac5e58184a2b06f8e9151cf99edf
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 08:12:20 +0000 (01:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a39d70c7962e6c2721ea408712e9bdd23770cea
Auto-generated-cl: translation import
Alan Viverette [Fri, 11 Oct 2013 00:34:55 +0000 (00:34 +0000)]
Merge "Update color blindness descriptions for translation"
Alan Viverette [Fri, 11 Oct 2013 00:34:08 +0000 (17:34 -0700)]
Update color blindness descriptions for translation
BUG:
11079175
Change-Id: I4498613c4ce796c2b86de714aebcf7397dffc7c8
David Christie [Thu, 10 Oct 2013 23:08:21 +0000 (16:08 -0700)]
am
156cec37: am
df0698e9: am
6d6d4976: Merge "Change location settings icons from crosshair to pin -b/
8142654" into klp-dev
* commit '
156cec37aaf0159ac89199021ce725960e43571d':
Change location settings icons from crosshair to pin -b/
8142654
David Christie [Thu, 10 Oct 2013 23:05:36 +0000 (16:05 -0700)]
am
df0698e9: am
6d6d4976: Merge "Change location settings icons from crosshair to pin -b/
8142654" into klp-dev
* commit '
df0698e9f655718743c2d065eae481f1f9d1aba3':
Change location settings icons from crosshair to pin -b/
8142654
David Christie [Thu, 10 Oct 2013 22:39:06 +0000 (15:39 -0700)]
am
6d6d4976: Merge "Change location settings icons from crosshair to pin -b/
8142654" into klp-dev
* commit '
6d6d4976104e811dab2eb8a4d3ff0680fc7eb46a':
Change location settings icons from crosshair to pin -b/
8142654
David Christie [Thu, 10 Oct 2013 22:28:31 +0000 (22:28 +0000)]
Merge "Change location settings icons from crosshair to pin -b/
8142654" into klp-dev
Svetoslav [Thu, 10 Oct 2013 17:24:35 +0000 (10:24 -0700)]
am
be74fb8d: am
43b8946f: am
d9f156dd: Coalescing multiple print job notifications (Settings)
* commit '
be74fb8d729828642cce0514e1043c290e8ceea0':
Coalescing multiple print job notifications (Settings)
Svetoslav [Thu, 10 Oct 2013 17:17:46 +0000 (10:17 -0700)]
am
43b8946f: am
d9f156dd: Coalescing multiple print job notifications (Settings)
* commit '
43b8946fb3071a1454aa17c352a34c2d389c096e':
Coalescing multiple print job notifications (Settings)
Svetoslav [Thu, 10 Oct 2013 17:14:27 +0000 (10:14 -0700)]
am
d9f156dd: Coalescing multiple print job notifications (Settings)
* commit '
d9f156ddf072775c894db1ca3c3fe8989be4dbeb':
Coalescing multiple print job notifications (Settings)
Yuhao Zheng [Thu, 10 Oct 2013 16:41:51 +0000 (09:41 -0700)]
Wi-Fi Direct setting UI: handle p2p disable state
This is not a normal use case as we can't enter Wi-Fi Direct setting when p2p
is disabled. However we can make this happen by entering Wi-Fi Direct setting
screen then disabling wifi via quick settings.
Previous UI implementation didn't handle p2p enable->disable change completely,
leaving the screen out-of-date until we change the screen orientation.
Now we always attach mThisDevicePref/mPeersGroup/mPersistentGroup to the screen,
but just disable them when p2p is disabled. Another advantage of doing this is
to avoid b/
11050625, which occurs when a PreferenceGroup is not attached to the
PreferenceScreen.
Bug:
11133069
Change-Id: I9be7b6e396d7677b5a33df8e6294b4a0aa6bd389
Yuhao Zheng [Thu, 10 Oct 2013 16:18:07 +0000 (16:18 +0000)]
Merge "Fix NPE in Wi-Fi Direct Setting UI"
The Android Automerger [Thu, 10 Oct 2013 13:01:39 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Svetoslav [Thu, 10 Oct 2013 04:59:04 +0000 (21:59 -0700)]
Coalescing multiple print job notifications (Settings)
We used to show a single notificaiton for every print job but
this is against th UX guidelines. Since we have to lead by
example, this change adds coalescing of multiple notifications.
bug:
11155212
Change-Id: I865450495e7e85bd6620c1f42aeef07d2f83a01a
Alan Viverette [Wed, 9 Oct 2013 20:34:26 +0000 (13:34 -0700)]
am
cb2cf8aa: am
b371444b: am
16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit '
cb2cf8aa4375fc6ba0abf9abffeafebeeb0964e1':
Fix caption settings picker layouts
Alan Viverette [Wed, 9 Oct 2013 20:31:04 +0000 (13:31 -0700)]
am
b371444b: am
16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit '
b371444b2fee94045ea97c7f4e97a08610595d61':
Fix caption settings picker layouts
Alan Viverette [Wed, 9 Oct 2013 20:29:08 +0000 (13:29 -0700)]
am
16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit '
16ad57483d7bba6f5c05ffd64431a900c400eff5':
Fix caption settings picker layouts
Alan Viverette [Wed, 9 Oct 2013 20:25:09 +0000 (20:25 +0000)]
Merge "Fix caption settings picker layouts" into klp-dev
Dianne Hackborn [Wed, 9 Oct 2013 19:23:52 +0000 (12:23 -0700)]
am
1acb82c5: am
c2d73bed: am
02099910: Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
* commit '
1acb82c563badb953831ed06216349260a89c3ac':
Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
Dianne Hackborn [Wed, 9 Oct 2013 19:21:42 +0000 (12:21 -0700)]
am
c2d73bed: am
02099910: Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
* commit '
c2d73bed9d1ed3cac7236bc9bf7b247871c9285d':
Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
Dianne Hackborn [Wed, 9 Oct 2013 19:18:10 +0000 (12:18 -0700)]
am
02099910: Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
* commit '
020999103b34860a89576cd5dba862009337e9a9':
Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
Dianne Hackborn [Wed, 9 Oct 2013 19:06:59 +0000 (12:06 -0700)]
Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
Use round instead of ceil. Also, when showing services from multiple packages,
sort the package categories by the duration of the longest running service in
each, so that the more important ones come first.
Change-Id: I42b47b0522cd786a1c4ee5b59a549ec7c0c6ffe1
David Christie [Mon, 7 Oct 2013 23:35:18 +0000 (16:35 -0700)]
Change location settings icons from crosshair to pin
-b/
8142654
Change-Id: I4c0b6aeb56a9a100c2869032bb09dc11cc66dcea
Lifu Tang [Wed, 9 Oct 2013 16:14:28 +0000 (09:14 -0700)]
am
e40897a8: am
9dc55e34: am
8a4c53ac: Limits the broadcast to system apps only
* commit '
e40897a8808d62ead601982a7d7771d64a2359c6':
Limits the broadcast to system apps only
OSDN Git Service
