Commit Graph

9161 Commits

Author SHA1 Message Date
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
Baligh Uddin
dcbd81e098 am 4f4cae2b: (-s ours) am 103f74b5: Import translations. DO NOT MERGE
* commit '4f4cae2b11dd4b4caa03ee71d2ec321f3704de3e':
  Import translations. DO NOT MERGE
2012-10-25 10:49:17 -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
c9d4d31c98 am f1e74da7: am cde507af: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit 'f1e74da7b6b6267d5ce1da432760552cc7ad8673':
  Reduce jank in security lock selection by finishing on return
2012-10-24 22:54:16 -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
Baligh Uddin
b379708c28 am 3c42b19d: (-s ours) am 5379dc64: am b8a97822: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '3c42b19d342024ffb69b05c1cb44cc4fdc4230ed':
  Import translations. DO NOT MERGE
2012-10-24 17:45:23 -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
49346db97f am ee398a5f: (-s ours) am cf24fc56: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'ee398a5f259d7994013d8fa95bd627c52232fd39':
  Import translations. DO NOT MERGE
2012-10-24 17:36:43 -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
ead856d16b Merge "Import translations. DO NOT MERGE" 2012-10-24 17:33:30 -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
Baligh Uddin
074602024c Import translations. DO NOT MERGE
Change-Id: Ic1270093a7d32d9f4ff80381a68d8e3fd9570d1f
Auto-generated-cl: translation import
2012-10-24 16:27:14 -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
5faee7d432 am d525470d: am 039a365f: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit 'd525470d4b7a290b7a55ee244d47f8e486cfe72c':
  Use given name instead of full name for the initial population of User name.
2012-10-24 13:35:02 -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
Baligh Uddin
76df067335 am b052137e: am 5a071255: am e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit 'b052137e33844d9d669b8f5564327d2d14334c84':
  Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:23:35 -07:00
Baligh Uddin
b052137e33 am 5a071255: am e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit '5a071255ca53778d7de3c31f2b685cba4c541cdf':
  Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:20:54 -07:00
Baligh Uddin
5a071255ca am e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit 'e508a26e037c1b0a813575f1154da0ede7644979':
  Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:18:03 -07:00
Baligh Uddin
06545e87b5 am e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit 'e508a26e037c1b0a813575f1154da0ede7644979':
  Remove blank translation string from en-GB, so it can show English.
2012-10-23 15:17:59 -07:00
Baligh Uddin
e508a26e03 Remove blank translation string from en-GB, so it can show English.
Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
2012-10-23 13:25:55 -07:00
Baligh Uddin
9bc8230dfe am cd4116e3: am 116a53c1: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
* commit 'cd4116e37a7a2cd493f34723e0c10fe94e41a067':
  Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:29:42 -07:00
Baligh Uddin
cd4116e37a am 116a53c1: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
* commit '116a53c133449ad36b0636bf03512c4a64112655':
  Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:27:03 -07:00
Baligh Uddin
a748995401 am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
* commit '50ab4b47bc776c257c1491cb4a68ee8afc5599e5':
  Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:24:40 -07:00
Baligh Uddin
116a53c133 am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
* commit '50ab4b47bc776c257c1491cb4a68ee8afc5599e5':
  Manually enter translations for msgid: 9014073093293520112
2012-10-23 11:24:13 -07:00
Baligh Uddin
50ab4b47bc Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev 2012-10-23 11:22:39 -07:00
Russell Brenner
d8e9d3ae07 am 1bf33372: am de7cc129: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '1bf3337289e640f93bf16ae4436d96b7847ff91f':
  Fix layout with no access points
2012-10-23 11:06:11 -07:00
Russell Brenner
1bf3337289 am de7cc129: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit 'de7cc12900c7015849f818809368716174920337':
  Fix layout with no access points
2012-10-23 11:03:37 -07:00
Russell Brenner
98f884b195 am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '26bb2398cf8ebe1879adfb3043709467474858ec':
  Fix layout with no access points
2012-10-23 11:02:59 -07:00
Russell Brenner
de7cc12900 am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '26bb2398cf8ebe1879adfb3043709467474858ec':
  Fix layout with no access points
2012-10-23 11:02:22 -07:00
Baligh Uddin
2baed326c3 Manually enter translations for msgid: 9014073093293520112
Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.

Bug: 7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d
2012-10-23 11:00:22 -07:00