OSDN Git Service
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
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 [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 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
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
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"
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
Ed Heyl [Wed, 9 Oct 2013 16:13:26 +0000 (09:13 -0700)]
am
9433dc8a: am
3cc7cf13: am
d8154590: merge in KFS78N (no-op)
* commit '
9433dc8ad1fd23d472ee1d80bfad3061505c120d':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Ed Heyl [Wed, 9 Oct 2013 16:12:40 +0000 (09:12 -0700)]
am
92bbd954: am
e1346bc7: am
cfa55e16: merge in KQS81M
* commit '
92bbd95423a03b1c021eb047b484bf12432fac4d':
Import translations. DO NOT MERGE
Print settings polish
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Nick Kralevich [Wed, 9 Oct 2013 15:57:19 +0000 (08:57 -0700)]
Fix build.
I have no idea if this is an appropriate change, but it's the
smallest patch I could come up with that lets the code compile.
Change-Id: I363386a23cd70f7a1207c5711d2e4b92e8e23937
Lifu Tang [Wed, 9 Oct 2013 04:34:17 +0000 (21:34 -0700)]
am
9dc55e34: am
8a4c53ac: Limits the broadcast to system apps only
* commit '
9dc55e348af75d7f22090de03e2a123bf961ab08':
Limits the broadcast to system apps only
Lifu Tang [Wed, 9 Oct 2013 04:32:08 +0000 (21:32 -0700)]
am
8a4c53ac: Limits the broadcast to system apps only
* commit '
8a4c53ac2bbd2eca81a8725212d4d61672fbfdef':
Limits the broadcast to system apps only
Svetoslav [Wed, 9 Oct 2013 00:42:25 +0000 (17:42 -0700)]
resolved conflicts for merge of
372cd6ab to master
Change-Id: I9232fbe01926436e8ad5c6c7e63ce95fbe842ccb
Lifu Tang [Tue, 8 Oct 2013 23:23:52 +0000 (16:23 -0700)]
Limits the broadcast to system apps only
- Part of b/
10974059
Change-Id: I1f0b6eeece88a2ee29b76636b9ce58dcc3d71aad
Ed Heyl [Tue, 8 Oct 2013 23:16:03 +0000 (16:16 -0700)]
am
3cc7cf13: am
d8154590: merge in KFS78N (no-op)
* commit '
3cc7cf1396a3e405f4b3eb8c51962423e2bcd10e':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Ed Heyl [Tue, 8 Oct 2013 23:09:39 +0000 (16:09 -0700)]
am
d8154590: merge in KFS78N (no-op)
* commit '
d8154590d5062598db8067c460aff54cbe49dd9e':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Christopher Tate [Tue, 8 Oct 2013 23:02:45 +0000 (16:02 -0700)]
am
7e776ad7: am
3eb0f422: am
eff0927d: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
* commit '
7e776ad76ce60eb0c68fb54b640b18c0e9843a04':
Once we decide to show Home settings, keep it shown forever
Ed Heyl [Tue, 8 Oct 2013 23:02:00 +0000 (16:02 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:58:16 +0000 (15:58 -0700)]
am
e1346bc7: am
cfa55e16: merge in KQS81M
* commit '
e1346bc75ae62bb9ceb31d42b5293df23150f7d2':
Import translations. DO NOT MERGE
Print settings polish
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Ed Heyl [Tue, 8 Oct 2013 22:47:50 +0000 (15:47 -0700)]
am
cfa55e16: merge in KQS81M
* commit '
cfa55e164b78c8b150cab82345c1c5be01f69c90':
Import translations. DO NOT MERGE
Print settings polish
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix bug when sharing to bluetooth.
Fix for TTS settings crash.
Restriction pin changes.
Remove Restrictions UI
Add some missing fragments to the whitelist
Potential fix for Settings instability on x-large.
Fix accidental creation of restriction entry for required apps
Fix broken strings in Settings
Always allow formatting of physical storage.
Guard against missing terminal app.
Ed Heyl [Tue, 8 Oct 2013 22:43:09 +0000 (15:43 -0700)]
merge in KQS81M
Alan Viverette [Tue, 8 Oct 2013 22:33:00 +0000 (15:33 -0700)]
Fix caption settings picker layouts
BUG:
11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd
Svetoslav [Tue, 8 Oct 2013 21:35:18 +0000 (14:35 -0700)]
am
d9649d4e: am
31962228: Merge "Fix a crash in the print service settigns." into klp-dev
* commit '
d9649d4e150130eef78a04c684007fe729f3206a':
Fix a crash in the print service settigns.
Svetoslav [Tue, 8 Oct 2013 21:32:20 +0000 (14:32 -0700)]
am
31962228: Merge "Fix a crash in the print service settigns." into klp-dev
* commit '
31962228aa0230272950e88cf635f0576e0bad67':
Fix a crash in the print service settigns.
Svetoslav [Tue, 8 Oct 2013 21:28:22 +0000 (21:28 +0000)]
Merge "Fix a crash in the print service settigns." into klp-dev
Christopher Tate [Tue, 8 Oct 2013 21:26:16 +0000 (14:26 -0700)]
am
3eb0f422: am
eff0927d: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
* commit '
3eb0f422f6e0291a274f72dc3951ce7cf048e5be':
Once we decide to show Home settings, keep it shown forever
Christopher Tate [Tue, 8 Oct 2013 21:23:22 +0000 (14:23 -0700)]
am
eff0927d: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
* commit '
eff0927df2515662a263fb79a5a060d81273a36b':
Once we decide to show Home settings, keep it shown forever
Christopher Tate [Tue, 8 Oct 2013 21:20:13 +0000 (21:20 +0000)]
Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
Svetoslav [Tue, 8 Oct 2013 19:08:14 +0000 (12:08 -0700)]
Fix a crash in the print service settigns.
When the search view is attached and detached we announce that
for accessibility. The trouble is that if the activity is being
torn down we are trying to access resources from a fragment that
is detached and the qcrash occurs. This change does not try to
access resources if the activity is finishing and also we do not
load resource strings if accessibility is not enabled.
bug:
11127814
Change-Id: If3e97b6e94687775386a43c8fa54fd45140306eb
Lifu Tang [Tue, 8 Oct 2013 19:01:45 +0000 (12:01 -0700)]
am
83df0123: am
40eefc17: am
1673fbc0: Broadcasting a message for mode changing
* commit '
83df01235788b2a820d68b7c8a51f7a0fc5c1d64':
Broadcasting a message for mode changing
Lifu Tang [Tue, 8 Oct 2013 18:58:44 +0000 (11:58 -0700)]
am
40eefc17: am
1673fbc0: Broadcasting a message for mode changing
* commit '
40eefc17d877357e074fff34c670b6e61f71deeb':
Broadcasting a message for mode changing
Lifu Tang [Tue, 8 Oct 2013 18:53:27 +0000 (11:53 -0700)]
am
1673fbc0: Broadcasting a message for mode changing
* commit '
1673fbc029d569b6424914db48e571b52091b4fc':
Broadcasting a message for mode changing
Christopher Tate [Tue, 8 Oct 2013 18:30:19 +0000 (11:30 -0700)]
Once we decide to show Home settings, keep it shown forever
Principle of Least Surprise FTW.
Bug
11131794
Change-Id: I1df720fa86fb870aa74a5d0074ca966843317f12
Yuhao Zheng [Mon, 7 Oct 2013 19:30:49 +0000 (12:30 -0700)]
Fix NPE in Wi-Fi Direct Setting UI
After a PreferenceGroup is created, attach it to a PreferenceScreen right away.
Otherwise, if PreferenceGroup.addPreference is accidentally called before being
attached, it will result in an NPE and a UI crash.
Bug:
11050625
Change-Id: I68fa8b67ab807c0729c43c1b5cdabdbcd4f2c230
Lifu Tang [Tue, 8 Oct 2013 09:24:17 +0000 (02:24 -0700)]
Broadcasting a message for mode changing
- Fix b/
10974059
Change-Id: I219ea35e65a36af9f041a487dd8039bb5e2f048b
Baligh Uddin [Tue, 8 Oct 2013 03:59:58 +0000 (20:59 -0700)]
am
9e442523: (-s ours) am
6b590746: (-s ours) am
1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
9e4425231efc19997f69376927ab8ef4c0ff0f7a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:54:41 +0000 (20:54 -0700)]
am
6b590746: (-s ours) am
1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6b590746dfdb3f721dab048a1978a5630da9e5eb':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:52:44 +0000 (20:52 -0700)]
am
0e124560: (-s ours) am
ebaa7509: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
0e124560e6d4c6c87f1a87ec7cecca3e35b741a1':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:51:30 +0000 (20:51 -0700)]
am
1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1955bf1bb3147a06d1856ac002f8cd5aab4f535e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:51:06 +0000 (20:51 -0700)]
am
ebaa7509: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
ebaa7509edda445e1d809b331d9ecc848fe19773':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:49:38 +0000 (03:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 8 Oct 2013 03:49:34 +0000 (03:49 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Tue, 8 Oct 2013 03:49:14 +0000 (03:49 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 02:06:16 +0000 (19:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0bfc7802cee3463b0ea003fa23a41ac948065cf
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Oct 2013 02:02:02 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: If370e7dc3d5de024ec3a6afd037019226fe45569
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Oct 2013 01:55:29 +0000 (18:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cdb9b939a3985f7eb7813fa0bfbc3129ca8638d
Auto-generated-cl: translation import
Chris Wren [Mon, 7 Oct 2013 20:12:23 +0000 (13:12 -0700)]
am
65994536: am
98b30cea: am
a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
* commit '
659945365d83bd30de5a506e9504687217393db8':
Hide Camera in CryptKeeperConfirm
Chris Wren [Mon, 7 Oct 2013 20:09:39 +0000 (13:09 -0700)]
am
98b30cea: am
a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
* commit '
98b30ceaa2ef049f41907ea9672bb5f028472f1c':
Hide Camera in CryptKeeperConfirm
Chris Wren [Mon, 7 Oct 2013 20:06:45 +0000 (13:06 -0700)]
am
a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
* commit '
a50f78515e2718fa5e47f283e25705806bd163aa':
Hide Camera in CryptKeeperConfirm
Chris Wren [Mon, 7 Oct 2013 20:01:35 +0000 (20:01 +0000)]
Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
David Braun [Mon, 7 Oct 2013 18:18:09 +0000 (11:18 -0700)]
am
1c2a3ad6: am
a633e1d5: am
1c17255d: Block "SMS Default Dialog" on non-phone devices
* commit '
1c2a3ad6cb262447ebed557c6b1bf36bab11d59e':
Block "SMS Default Dialog" on non-phone devices
David Braun [Mon, 7 Oct 2013 18:15:39 +0000 (11:15 -0700)]
am
a633e1d5: am
1c17255d: Block "SMS Default Dialog" on non-phone devices
* commit '
a633e1d54d28d5c646b1f99df62a9250e48340ce':
Block "SMS Default Dialog" on non-phone devices
David Braun [Mon, 7 Oct 2013 18:13:22 +0000 (11:13 -0700)]
am
1c17255d: Block "SMS Default Dialog" on non-phone devices
* commit '
1c17255d5edadaf1790af365d2ed5f962a7bcc65':
Block "SMS Default Dialog" on non-phone devices
David Braun [Mon, 7 Oct 2013 16:35:52 +0000 (09:35 -0700)]
Block "SMS Default Dialog" on non-phone devices
This change also handles the case where getDefaultSmsApplication returns
null more elegantly, though this is only really possible on a device that
is a tablet (blocked earlier in the method) or a phone device that had no
SMS apps at boot (when we force the setting of an SMS app.)
Bug:
11072894 People app should not launch into default SMS app on tablets
Change-Id: I1e253873e053c21bc1652bd03d7b486aaf9be5e1
Chris Wren [Mon, 7 Oct 2013 05:11:08 +0000 (01:11 -0400)]
Hide Camera in CryptKeeperConfirm
Bug:
10900437
Change-Id: Ie9bbe3bacba6fb37ddd6c2753e011dc7abb63c77
Baligh Uddin [Sat, 5 Oct 2013 16:40:53 +0000 (09:40 -0700)]
am
2abb3443: (-s ours) am
040cfe56: (-s ours) am
8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2abb3443170885bc41ccfaa903796f6435b10839':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 16:37:01 +0000 (09:37 -0700)]
am
040cfe56: (-s ours) am
8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
040cfe56112326d470a58b2f55642a234ff3fce2':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 03:42:22 +0000 (20:42 -0700)]
am
5318a0d3: (-s ours) am
249100c1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
5318a0d3059c65f51464c7110e34d4f5a33de7be':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 03:41:16 +0000 (20:41 -0700)]
am
8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8aecb7cea083366fc85d8088d7e5e18e775fee80':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 03:40:32 +0000 (20:40 -0700)]
am
249100c1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
249100c1151569a9e903489b2f496446f740cc29':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 03:38:21 +0000 (03:38 +0000)]
Merge "Import translations. DO NOT MERGE"