Commit Graph

12485 Commits

Author SHA1 Message Date
Torne (Richard Coles)
9880646e19 am f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit 'f88e5442f5d2492d415864d1cd118d610b0005d0':
  Remove experimental WebView setting.
2013-10-15 03:34:15 -07:00
Torne (Richard Coles)
f88e5442f5 Merge "Remove experimental WebView setting." into klp-dev 2013-10-15 10:31:46 +00:00
Baligh Uddin
9e9d6cd33f am 81d0f1b9: (-s ours) am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '81d0f1b93c9e1be59546a5efa875202378efacbe':
  Import translations. DO NOT MERGE
2013-10-14 20:01:30 -07:00
Baligh Uddin
81d0f1b93c am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '9f9a9652099204c2e15f1c1660e6886162932943':
  Import translations. DO NOT MERGE
2013-10-14 19:01:01 -07:00
Yuhao Zheng
b8b3f5bee0 Merge "Refresh peer list when entering wifi p2p settings" 2013-10-15 00:25:28 +00:00
Baligh Uddin
9f9a965209 am 740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '740702ced3d69f3c0b8208ace86e88e4a76ccba0':
  Import translations. DO NOT MERGE
2013-10-14 17:19:28 -07:00
Baligh Uddin
13ccffdb6b Merge "Import translations. DO NOT MERGE" 2013-10-14 22:54:01 +00:00
Baligh Uddin
548de33483 Import translations. DO NOT MERGE
Change-Id: If06a2397c8b907b0593374a89ad2d22bc53382c1
Auto-generated-cl: translation import
2013-10-14 15:30:24 -07:00
Baligh Uddin
740702ced3 Import translations. DO NOT MERGE
Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import
2013-10-14 15:24:56 -07:00
Baligh Uddin
829ef8c55b am ce4a93f3: (-s ours) am fea253e0: (-s ours) am 37473121: (-s ours) Import translations. DO NOT MERGE
* commit 'ce4a93f3f4c8ef5c8f2b099f667ad41bcce2e3d2':
  Import translations. DO NOT MERGE
2013-10-14 10:50:16 -07:00
Baligh Uddin
63aa0f9411 am d7e8a7f8: (-s ours) am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit 'd7e8a7f813376e0e33e9be4031047ec5ae0c8eb4':
  Import translations. DO NOT MERGE
2013-10-14 10:48:34 -07:00
Baligh Uddin
8a81a66078 am 7508ef29: (-s ours) am 8dd824b6: (-s ours) Import translations. DO NOT MERGE
* commit '7508ef29dc4fd823048a3dfc4053a0dea2191c5c':
  Import translations. DO NOT MERGE
2013-10-14 10:48:34 -07:00
Torne (Richard Coles)
0bf324c628 Remove experimental WebView setting.
The experimental WebView is no longer experimental; remove the setting
from the settings app.

Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
2013-10-14 17:35:43 +01:00
The Android Automerger
9ece30cb75 merge in klp-release history after reset to klp-dev 2013-10-13 06:02:42 -07:00
Baligh Uddin
ce4a93f3f4 am fea253e0: (-s ours) am 37473121: (-s ours) Import translations. DO NOT MERGE
* commit 'fea253e00a835ed876211dba9d0f37edc9f162e9':
  Import translations. DO NOT MERGE
2013-10-12 06:46:01 -07:00
Baligh Uddin
fea253e00a am 37473121: (-s ours) Import translations. DO NOT MERGE
* commit '37473121937ad62b616e849e21954cf39583e465':
  Import translations. DO NOT MERGE
2013-10-12 06:43:48 -07:00
Baligh Uddin
04e9687144 Import translations. DO NOT MERGE
Change-Id: I61a6ed38ca7f23682f15d452b199e57f3dc4b632
Auto-generated-cl: translation import
2013-10-12 00:59:55 -07:00
Baligh Uddin
3747312193 Import translations. DO NOT MERGE
Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import
2013-10-12 00:56:01 -07:00
Baligh Uddin
d7e8a7f813 am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '84c377f51a0995b2f70028df12abb9f98c44e915':
  Import translations. DO NOT MERGE
2013-10-11 15:03:27 -07:00
Baligh Uddin
7508ef29dc am 8dd824b6: (-s ours) Import translations. DO NOT MERGE
* commit '8dd824b60b9345df7409bbd35e1b9ff7b3b051e6':
  Import translations. DO NOT MERGE
2013-10-11 15:03:26 -07:00
Baligh Uddin
84c377f51a am 9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '9c861f80a2f87d007c7bce7493a154d33702f785':
  Import translations. DO NOT MERGE
2013-10-11 15:01:27 -07:00
Baligh Uddin
36d4eb83c8 Import translations. DO NOT MERGE
Change-Id: Ifa7a23156b38840d7807de126a8eb3d556ac95ff
Auto-generated-cl: translation import
2013-10-11 14:56:37 -07:00
Baligh Uddin
8dd824b60b Import translations. DO NOT MERGE
Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import
2013-10-11 14:51:44 -07:00
Baligh Uddin
9c861f80a2 Import translations. DO NOT MERGE
Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import
2013-10-11 14:47:56 -07:00
Zhihai Xu
b2201f586d 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
2013-10-11 14:13:33 -07:00
Zhihai Xu
c326942dfd 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
2013-10-11 14:10:13 -07:00
Yuhao Zheng
5d2169eb6f 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
2013-10-11 14:08:48 -07:00
Zhihai Xu
cf71c2d3e3 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
2013-10-11 14:06:13 -07:00
Zhihai Xu
83936d967d Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 2013-10-11 21:02:51 +00:00
Dianne Hackborn
5e53e25e8d 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.
2013-10-11 12:55:04 -07:00
Dianne Hackborn
47be2e84d0 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.
2013-10-11 12:50:07 -07:00
Zhihai Xu
9998639a65 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
2013-10-11 12:15:19 -07:00
Dianne Hackborn
4f00b368f9 am b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit 'b1e33884190732a58bfbfe659898e02d41fe39f4':
  Allow tapping on memory status regions to filter proc stats.
2013-10-11 11:59:51 -07:00
Dianne Hackborn
b1e3388419 Allow tapping on memory status regions to filter proc stats.
Change-Id: Iade56907df648a95600919578154635c49ac9dce
2013-10-11 11:54:34 -07:00
Yuhao Zheng
aa62e2be18 Merge "Wi-Fi Direct setting UI: handle p2p disable state" 2013-10-11 18:38:09 +00:00
Andrew Flynn
17c008e9d0 Check for presence of carrier app in Mobile Plan.
When the user chooses Mobile Plan in Settings, first do a check to see if
a valid carrier app for the current MCC/MNC exists. If so, launch that app
instead of checking for a provisioning URL or hoping for a DNS redirect in
the browser. If no such app exists, continue on as normal.

Bug: 9623212
Change-Id: I81538063d4cdd147948a83ffc0c2641174ba9001
2013-10-11 09:21:41 -07:00
Baligh Uddin
66b197f32e am b13b7995: (-s ours) am bcdb5eec: (-s ours) am 6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit 'b13b7995884570bbc3f24ac6e15d6fcc72bd7d4d':
  Import translations. DO NOT MERGE
2013-10-11 08:37:18 -07:00
Baligh Uddin
b13b799588 am bcdb5eec: (-s ours) am 6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit 'bcdb5eec863be4b46b608bda586c889760afba0a':
  Import translations. DO NOT MERGE
2013-10-11 08:30:50 -07:00
Baligh Uddin
bac6a7e89a am 672c00c3: (-s ours) am 3104c1ce: (-s ours) Import translations. DO NOT MERGE
* commit '672c00c34b1494d6681d414b4ca4a6ca0b18ad64':
  Import translations. DO NOT MERGE
2013-10-11 08:30:09 -07:00
Baligh Uddin
bcdb5eec86 am 6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit '6e96aff5546f02199cf4c8aba0bae132d7d35e43':
  Import translations. DO NOT MERGE
2013-10-11 08:27:19 -07:00
Baligh Uddin
672c00c34b am 3104c1ce: (-s ours) Import translations. DO NOT MERGE
* commit '3104c1ce9fd8e06e5c380898b1e9f017825c996a':
  Import translations. DO NOT MERGE
2013-10-11 08:27:07 -07:00
Baligh Uddin
855f866cdd Merge "Import translations. DO NOT MERGE" 2013-10-11 15:22:45 +00:00
Baligh Uddin
38d0357739 Import translations. DO NOT MERGE
Change-Id: I2ef84bf546ddd4be1daa67e14bf5152a4bf2b381
Auto-generated-cl: translation import
2013-10-11 01:22:14 -07:00
Baligh Uddin
3104c1ce9f Import translations. DO NOT MERGE
Change-Id: I227ca980e6c3ac5e58184a2b06f8e9151cf99edf
Auto-generated-cl: translation import
2013-10-11 01:17:11 -07:00
Baligh Uddin
6e96aff554 Import translations. DO NOT MERGE
Change-Id: I7a39d70c7962e6c2721ea408712e9bdd23770cea
Auto-generated-cl: translation import
2013-10-11 01:12:20 -07:00
Alan Viverette
b57fe58e6e Merge "Update color blindness descriptions for translation" 2013-10-11 00:34:55 +00:00
Alan Viverette
7ec57940c0 Update color blindness descriptions for translation
BUG: 11079175
Change-Id: I4498613c4ce796c2b86de714aebcf7397dffc7c8
2013-10-10 17:34:08 -07:00
David Christie
774a06593e 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
2013-10-10 16:08:21 -07:00
David Christie
156cec37aa 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
2013-10-10 16:05:36 -07:00
David Christie
df0698e9f6 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
2013-10-10 15:39:06 -07:00