Commit Graph

13519 Commits

Author SHA1 Message Date
Baligh Uddin
46cdfed89c Merge "Import translations. DO NOT MERGE" 2014-01-09 04:04:24 +00:00
Fabrice Di Meglio
8c4ccb87ca Code cleaning for removing dual pane meta data as it is no more used
- remove META_DATA_KEY_PARENT_TITLE and META_DATA_KEY_PARENT_FRAGMENT_CLASS

Change-Id: Ied38e9a26e3c47edec56437818bb6f2daa7f8621
2014-01-08 15:53:44 -08:00
Jorim Jaggi
4378743a2f Remove outdated custom background for password field.
In the lockscreen settings, the entry text field for the PIN/password still uses an outdated, gingerbready background. This is removed by using the default Holo background.

Bug: 12382439
Change-Id: Iaa7ea4980060762841646a4b8ea18d008518c24b
2014-01-08 15:03:25 -08:00
RoboErik
813a54d216 b/12068020 Update calls to InputManager
This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.

Change-Id: I3eeebc0223820aeab62c2b8aa822f4d91adaf2d1
2014-01-08 13:57:34 -08:00
Baligh Uddin
6b67fe51dc Import translations. DO NOT MERGE
Change-Id: Id94be623bf3a47fab9034a791a32804c6f4d65fa
Auto-generated-cl: translation import
2014-01-08 11:18:23 -08:00
The Android Automerger
3ec00a235a merge in master-release history after reset to master 2014-01-08 05:50:10 -08:00
Yuhao Zheng
f20f5ce89a Merge "Make wifi dialog persist after orientation change" 2014-01-07 19:39:13 +00:00
Amith Yamasani
ecc1730a9c am 200b6c63: am 3cfb6767: am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '200b6c63237bcf1d911d5e8b48a4cd2f05d0ce3d':
  Dont show "Erase SD Card" when there is none
2014-01-07 19:23:09 +00:00
Yuhao Zheng
6c81d90be3 Make wifi dialog persist after orientation change
Wifi "cancel/forget/connect" pop-up window does not persist after orientation
changes. Specifically, after orientation changes, the connect button disappears.

This is because dialog information is not saved properly. When a saved wifi
config is found in the scan results, this entry is BOTH a wifi config AND a scan
result. Previous implementation has 2 issues:

1. Scan result part isn't saved. That's why the connect button after orientation
   changes, as UI didn't see a scan result section and thought it's not in range.

2. When both wifi config and scan result are saved, they are not restored
   correctly. Restoring wifi config will reset mRssi field in scan result part,
   while restoring scan result will reset netowrkId in wifi config part.

Both issuses are fixed.

bug: 9053186
Change-Id: Ic3ee7b5931c91d4b2f5c723fb8718cf752463109
2014-01-07 10:59:30 -08:00
Amith Yamasani
200b6c6323 am 3cfb6767: am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '3cfb676758b5ec44100a0a8cd47f1c4a7a615775':
  Dont show "Erase SD Card" when there is none
2014-01-07 18:48:22 +00:00
Amith Yamasani
3cfb676758 am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit 'e7d8485a23def2f0670ba2813f5589cbef562d4d':
  Dont show "Erase SD Card" when there is none
2014-01-07 18:45:23 +00:00
Amith Yamasani
e7d8485a23 am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
  Dont show "Erase SD Card" when there is none
2014-01-07 10:42:15 -08:00
Amith Yamasani
5be77489e2 Merge "Dont show "Erase SD Card" when there is none" 2014-01-07 18:37:54 +00:00
The Android Automerger
1da5250f54 merge in master-release history after reset to master 2014-01-07 06:22:48 -08:00
Baligh Uddin
becfb95248 am 021be85f: (-s ours) am 2659aeb1: (-s ours) am 094de604: (-s ours) am 3f426653: (-s ours) am 6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '021be85f52e01f89131888de841ab959e4f46a91':
  Import translations. DO NOT MERGE
2014-01-07 05:53:58 +00:00
Baligh Uddin
021be85f52 am 2659aeb1: (-s ours) am 094de604: (-s ours) am 3f426653: (-s ours) am 6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '2659aeb1fae6cb031647321df59ad9bbff86847e':
  Import translations. DO NOT MERGE
2014-01-07 05:50:13 +00:00
Baligh Uddin
2659aeb1fa am 094de604: (-s ours) am 3f426653: (-s ours) am 6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '094de60467fc1cb2d2635a3a4aa82dff79d355fc':
  Import translations. DO NOT MERGE
2014-01-07 05:46:12 +00:00
Baligh Uddin
094de60467 am 3f426653: (-s ours) am 6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '3f4266533121113a62e33fc4b3e1072f841f5d50':
  Import translations. DO NOT MERGE
2014-01-06 21:07:02 -08:00
Baligh Uddin
3f42665331 am 6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '6b8a7116a2203b32cff432fd1602cc3e186b2608':
  Import translations. DO NOT MERGE
2014-01-06 21:04:29 -08:00
Baligh Uddin
6ec3de28b9 Merge "Import translations. DO NOT MERGE" 2014-01-07 05:00:49 +00:00
Baligh Uddin
aa4f947611 Import translations. DO NOT MERGE
Change-Id: I8014cf9cada2cd71bcd00121975f25fa4426e372
Auto-generated-cl: translation import
2014-01-06 18:49:53 -08:00
Baligh Uddin
6b8a7116a2 Import translations. DO NOT MERGE
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
2014-01-06 18:46:29 -08:00
John Spurlock
3e9110fe6a Merge "Remove rotation-lock from Display settings." 2014-01-06 19:22:15 +00:00
The Android Automerger
8ffceada03 merge in master-release history after reset to master 2014-01-06 07:50:24 -08:00
Elliott Hughes
d954e2cc1c am 391af725: am 8995a94d: am 97886741: am f85d9841: Merge "Fix elapsed time formatting."
* commit '391af72514dfca243249fb873b639401bcf0c129':
  Fix elapsed time formatting.
2014-01-03 21:45:43 +00:00
Elliott Hughes
391af72514 am 8995a94d: am 97886741: am f85d9841: Merge "Fix elapsed time formatting."
* commit '8995a94d4eb7d8de10ae0758751357f452a898c9':
  Fix elapsed time formatting.
2014-01-03 21:42:53 +00:00
Elliott Hughes
8995a94d4e am 97886741: am f85d9841: Merge "Fix elapsed time formatting."
* commit '97886741b916048cd5974d336c18f2b625dcb7fd':
  Fix elapsed time formatting.
2014-01-03 21:39:20 +00:00
Elliott Hughes
97886741b9 am f85d9841: Merge "Fix elapsed time formatting."
* commit 'f85d9841f8e198de656973a2102d3239e628390a':
  Fix elapsed time formatting.
2014-01-03 13:36:27 -08:00
Elliott Hughes
f85d9841f8 Merge "Fix elapsed time formatting." 2014-01-03 21:28:13 +00:00
Elliott Hughes
f7cb4b0dda Fix elapsed time formatting.
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
2014-01-03 12:14:13 -08:00
The Android Automerger
7aeb3d4505 merge in master-release history after reset to master 2014-01-03 07:52:55 -08:00
Baligh Uddin
bf795e7ed5 Import translations. DO NOT MERGE
Change-Id: Iac0ca68f26633df3b392e7c2559767485b1571d6
Auto-generated-cl: translation import
2014-01-02 09:50:54 -08:00
Baligh Uddin
034e0e73ad am 348fb275: (-s ours) am d28125b7: (-s ours) am 9114be55: (-s ours) am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '348fb275a25f473658b83bf997e5207975fe0ecb':
  Import translations. DO NOT MERGE
2013-12-31 00:48:34 +00:00
Baligh Uddin
348fb275a2 am d28125b7: (-s ours) am 9114be55: (-s ours) am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit 'd28125b742479ce571b7dd32b2c90169200b5479':
  Import translations. DO NOT MERGE
2013-12-31 00:46:25 +00:00
Baligh Uddin
d28125b742 am 9114be55: (-s ours) am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '9114be558880d42af1e8095bd7734c7256490aba':
  Import translations. DO NOT MERGE
2013-12-31 00:44:18 +00:00
Baligh Uddin
9114be5588 am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit 'c9d1e6f49cf5be83fad9002942c47499c7fcbc35':
  Import translations. DO NOT MERGE
2013-12-30 16:42:54 -08:00
Baligh Uddin
c9d1e6f49c am 0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '0ae418b207f37bbc9ed4b0be267054f8244dc70a':
  Import translations. DO NOT MERGE
2013-12-30 16:41:18 -08:00
Baligh Uddin
6006d2c2da Import translations. DO NOT MERGE
Change-Id: I0f3e103c568ec7c7ddee3695e73a7a9f47465730
Auto-generated-cl: translation import
2013-12-30 15:13:19 -08:00
Baligh Uddin
0ae418b207 Import translations. DO NOT MERGE
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
2013-12-30 15:09:59 -08:00
Andres Morales
13c42cfefc Reduce timeout of dismissing pairing dialog on success
Change-Id: If4b74559cd6f628164b8b114c8c8b509dcb6b884
2013-12-30 12:56:55 -08:00
Selim Gurun
f64facc2f9 Display certificate chain
Bug: 5012010
Change-Id: Id1b4753b28ab3460662ea41feea277777e655780
2013-12-27 18:17:24 -08:00
Baligh Uddin
85d0f81a89 am be790f34: (-s ours) am 6c6d0738: (-s ours) am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit 'be790f347a982d6165e186e87cfa051e95e36926':
  Import translations. DO NOT MERGE
2013-12-27 04:06:51 +00:00
Baligh Uddin
be790f347a am 6c6d0738: (-s ours) am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '6c6d073847c1c26861671e042a1916b3efcdf5d9':
  Import translations. DO NOT MERGE
2013-12-27 04:04:22 +00:00
Baligh Uddin
6c6d073847 am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '95fbce75a7a3c4937c08b610965cc7d7e1aea403':
  Import translations. DO NOT MERGE
2013-12-27 04:01:11 +00:00
Baligh Uddin
95fbce75a7 am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit 'd0c1b8cbee025b009261a5e9e3ae37e9cbb891ef':
  Import translations. DO NOT MERGE
2013-12-26 19:57:05 -08:00
Baligh Uddin
d0c1b8cbee am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '0f952752e387cd4035193015ff3fa793164c980c':
  Import translations. DO NOT MERGE
2013-12-26 19:51:27 -08:00
Baligh Uddin
63974a92c8 Import translations. DO NOT MERGE
Change-Id: I295b494750d386344faed16eb3f281dfac28bea2
Auto-generated-cl: translation import
2013-12-26 16:30:07 -08:00
Baligh Uddin
0f952752e3 Import translations. DO NOT MERGE
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
2013-12-26 16:26:39 -08:00
Alan Viverette
dd6513d969 Merge "Additional captioning fonts" 2013-12-20 00:41:02 +00:00
Alan Viverette
7f9781b559 Merge "Additional caption settings for edge styles and window color" 2013-12-20 00:40:53 +00:00