Commit Graph

9304 Commits

Author SHA1 Message Date
Michael Jurka
ed3e89abe5 am eabe82d0: am 7d078f94: Fix crash when viewing installed app details page
* commit 'eabe82d032ee8a3668046792cb6743fec4181d58':
2012-10-29 13:34:52 -07:00
Baligh Uddin
391dc9f798 am 3441d4ac: (-s ours) am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '3441d4ac6a2368d56c2d88a65a36da414bd53a24':
2012-10-29 13:34:50 -07:00
Baligh Uddin
33ed3e0591 Import translations. DO NOT MERGE
Change-Id: Ifdee0ced0a57d8ccf512e12166ea1ec66418a6c2
Auto-generated-cl: translation import
2012-10-29 13:31:03 -07:00
Baligh Uddin
fc66cb8386 Import translations. DO NOT MERGE
Change-Id: Iab4a9535ce1e86eb842f82bcbb9a7e689a168064
Auto-generated-cl: translation import
2012-10-29 13:24:42 -07:00
Baligh Uddin
d285188d24 Import translations. DO NOT MERGE
Change-Id: I93035479d7bf14c84ce3d39da4fca2dfdaadd9d6
Auto-generated-cl: translation import
2012-10-29 13:15:52 -07:00
Vikram Aggarwal
8d028a87e9 Allow wireless charging during encrypt
Bug: 7426476 Cant Encrypt mako device using Charging pad as charging
             source

Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d
2012-10-29 12:42:55 -07:00
The Android Automerger
ab7392b892 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-29 11:20:23 -07:00
Baligh Uddin
af70bb4c82 am 3e418847: Import translations. DO NOT MERGE
* commit '3e41884765347d7671e414c884901bafe70f225d':
  Import translations. DO NOT MERGE
2012-10-29 07:44:33 -07:00
Baligh Uddin
910fe0479a am e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit 'e42e7b85285963cd959cec701689deaefbe44898':
  Import translations. DO NOT MERGE
2012-10-28 18:36:02 -07:00
Baligh Uddin
9ad78e880f Import translations. DO NOT MERGE
Change-Id: I60f85bd27cdf76663190767052c90db3c521848f
Auto-generated-cl: translation import
2012-10-28 12:43:44 -07:00
Baligh Uddin
e42e7b8528 Import translations. DO NOT MERGE
Change-Id: Ida5a2fe0251fde7f8ad846aa94564a5be6c5fe0b
Auto-generated-cl: translation import
2012-10-28 12:42:08 -07:00
Baligh Uddin
3e41884765 Import translations. DO NOT MERGE
Change-Id: I55019ba1b073d0d11ac5faed3830207e2066b7e8
Auto-generated-cl: translation import
2012-10-28 12:40:31 -07:00
Eric Laurent
79b7fdd2c0 Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev 2012-10-27 14:43:39 -07:00
Eric Laurent
e00cd9ff60 added dock audio settings for non bluetooth docks
This is a quick implementation allowing support for non bluetooth
audio docks.

Longer term it would be better to generalize DockService to support
all kinds of docks.

Bug 7302106.

Change-Id: I2df31ddbd8057a7297b244ea6a9e2d5a6a39bf7f
2012-10-27 13:30:55 -07:00
The Android Automerger
30d4f7d4a5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-26 16:23:12 -07:00
Fábio Silva
b6676bb6a3 Changed the way that date format selector is shown.
Changed the way that date format selector is shown excluding ambiguity when day and month have same value.
- i.e. 01/01/2012 (mm-DD-YYYY) and 01/01/2012 (DD-mm-YYYY)
Now it displays 31/12/2012 for DD-mm-YYYY and 12/31/2012 for mm-DD-YYYY.

Change-Id: I27434c9d5713491950d4f345dccf65d647d399cf
2012-10-26 20:05:27 -03:00
Daniel Sandler
4b84bd17d7 am b9cc1faf: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit 'b9cc1faf129d1d583bd5c541fe2ab1526032d559':
  Wording change for Daydream setting
2012-10-26 05:50:20 -07:00
Daniel Sandler
b9cc1faf12 am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
  Wording change for Daydream setting
2012-10-26 05:47:32 -07:00
Daniel Sandler
381df27cd6 am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
  Wording change for Daydream setting
2012-10-26 05:46:14 -07:00
Daniel Sandler
4cf289ad4d Merge "Wording change for Daydream setting" into jb-mr1-dev 2012-10-26 04:46:14 -07:00
Michael Jurka
8a4024ecac Add ability to add clock widget to keyguard
Change-Id: I70e6fbb664181efc2906ed33d732695279462a95
2012-10-25 16:05:10 -07:00
The Android Automerger
1e02061961 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-25 13:42:45 -07:00
Baligh Uddin
4f4cae2b11 am 103f74b5: Import translations. DO NOT MERGE
* commit '103f74b55fe07b15c8e87c04e2a83cd4fabdf902':
  Import translations. DO NOT MERGE
2012-10-25 10:46:33 -07:00
Baligh Uddin
103f74b55f Import translations. DO NOT MERGE
Change-Id: Ie1bf43d9ee2b5a3008e0d1be25329fc56ed633af
Auto-generated-cl: translation import
2012-10-25 10:41:18 -07:00
Amith Yamasani
f1e74da7b6 am cde507af: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit 'cde507af4c99ca9e411bd8f83eaba65262473b01':
  Reduce jank in security lock selection by finishing on return
2012-10-24 22:51:18 -07:00
Amith Yamasani
67920f0639 am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit 'b02771eff35cccf03202e4b8e27a44681a5f7570':
  Reduce jank in security lock selection by finishing on return
2012-10-24 22:48:41 -07:00
Amith Yamasani
cde507af4c am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit 'b02771eff35cccf03202e4b8e27a44681a5f7570':
  Reduce jank in security lock selection by finishing on return
2012-10-24 22:48:39 -07:00
Amith Yamasani
b02771eff3 Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev 2012-10-24 22:47:18 -07:00
Daniel Sandler
4125fbd5c1 Wording change for Daydream setting
Bug: 7410881
Change-Id: I5970254f2ffc33ab34fa61c08acaf1564e2556ca
2012-10-24 23:37:45 -04:00
Michael Jurka
d4362b7d35 Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev 2012-10-24 18:28:28 -07:00
Michael Jurka
89a30ffc63 Adding ability to add multiple keyguard widgets
Bug: 7381803

Change-Id: I099f47a5cc43199635fed9ad2c4d03d79004e4f4
2012-10-24 17:44:36 -07:00
Baligh Uddin
3c42b19d34 am 5379dc64: am b8a97822: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '5379dc64b216367b1be47d0a069900aebd8164c8':
  Import translations. DO NOT MERGE
2012-10-24 17:40:22 -07:00
Baligh Uddin
ee398a5f25 am cf24fc56: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'cf24fc5695e0e58238001a4b0eeee594e4f6df0b':
  Import translations. DO NOT MERGE
2012-10-24 17:33:41 -07:00
Baligh Uddin
5379dc64b2 am b8a97822: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b8a9782221c27646ade69141e09a4faa3473422e':
  Import translations. DO NOT MERGE
2012-10-24 17:33:36 -07:00
Baligh Uddin
ed49b6fc39 am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b8a9782221c27646ade69141e09a4faa3473422e':
  Import translations. DO NOT MERGE
2012-10-24 17:33:28 -07:00
Baligh Uddin
e00f034ec7 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-24 17:32:35 -07:00
Baligh Uddin
b8a9782221 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-24 17:31:11 -07:00
Baligh Uddin
cf24fc5695 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-24 17:30:17 -07:00
The Android Automerger
58ed28efc6 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-24 16:57:17 -07:00
Baligh Uddin
a8f59cc8b5 Import translations. DO NOT MERGE
Change-Id: I5e09f5b9727a8c8121eb2243bc519b99eb313903
Auto-generated-cl: translation import
2012-10-24 16:19:55 -07:00
Baligh Uddin
2b274471f9 Import translations. DO NOT MERGE
Change-Id: I5a5f54816579e0aef799b0a695bae71deb69eb69
Auto-generated-cl: translation import
2012-10-24 16:15:53 -07:00
Baligh Uddin
fa00ff0099 Import translations. DO NOT MERGE
Change-Id: I650b82d0cfbb0b54f90e6932a09ad576216005eb
Auto-generated-cl: translation import
2012-10-24 16:12:21 -07:00
Amith Yamasani
c666c65fab Reduce jank in security lock selection by finishing on return
Earlier the finish of the chooser was happening before the pattern/pin chooser
was started, resulting in two transitions.

This change defers the finish to after returning from the other activity. There
is still sometimes a very small glitch on the way back, but much smaller than
the current problem.

Bug: 7342594

Change-Id: I5f4f4393b841ce31dc7236074381283155ebddbd
2012-10-24 13:57:01 -07:00
Amith Yamasani
d525470d4b am 039a365f: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit '039a365f961a69845438c22cc4c3a560bc82ed3f':
  Use given name instead of full name for the initial population of User name.
2012-10-24 13:32:04 -07:00
Amith Yamasani
c250ae9d71 am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit '5749ce0903cad3160a5cf907af3a9a4cbc4b1d4e':
  Use given name instead of full name for the initial population of User name.
2012-10-24 13:29:28 -07:00
Amith Yamasani
039a365f96 am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit '5749ce0903cad3160a5cf907af3a9a4cbc4b1d4e':
  Use given name instead of full name for the initial population of User name.
2012-10-24 13:29:28 -07:00
Amith Yamasani
5749ce0903 Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev 2012-10-24 13:26:39 -07:00
Amith Yamasani
8d40fac706 Use given name instead of full name for the initial population of User name.
Bug: 7406217

Change-Id: I5006039ef146369f569445d0fcbaf82fd163343e
2012-10-24 10:30:51 -07:00
The Android Automerger
27dccee942 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 16:47:32 -07:00
Baligh Uddin
62abddace3 Remove blank translation string from en-GB, so it can show English.
Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
2012-10-23 16:06:06 -07:00