Commit Graph

8802 Commits

Author SHA1 Message Date
Casey Burkhardt
d3a3bfd598 am af8b915f: am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208
* commit 'af8b915f9c49b50aa02e41d3849ed0668b833328':
2012-10-29 13:39:28 -07:00
Zhihai Xu
3cb9919c05 am b1571ad6: am 57569b40: am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit 'b1571ad6866184c0048f60ea05e235856a1464b1':
2012-10-29 13:39:27 -07:00
Amith Yamasani
1d4ecd8a63 am 3ad17a08: am 89e93c97: am 7a1c4cdf: Fix check for multiple users
* commit '3ad17a084836a3a501229e09d29fe9d838bc440f':
2012-10-29 13:39:25 -07:00
Michael Jurka
44e83b4eec am ed3e89ab: am eabe82d0: am 7d078f94: Fix crash when viewing installed app details page
* commit 'ed3e89abe50425f50bce2880bff86a6e38772f10':
2012-10-29 13:39:24 -07:00
Baligh Uddin
5f5f37b21f am 391dc9f7: am 3441d4ac: (-s ours) am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '391dc9f798a0b0314c0355a6347d38b8e2e8972e':
2012-10-29 13:39:23 -07:00
Casey Burkhardt
af8b915f9c am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208
* commit '7367bb2a3118d8eb4cabc52883ec396a6b019e25':
2012-10-29 13:34:55 -07:00
Zhihai Xu
b1571ad686 am 57569b40: am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '57569b4080f4987548915b29daf021d3bb2cbb7b':
2012-10-29 13:34:54 -07:00
Amith Yamasani
3ad17a0848 am 89e93c97: am 7a1c4cdf: Fix check for multiple users
* commit '89e93c97d5cbb9bace0d98862604e8330f32f5fb':
2012-10-29 13:34:53 -07:00
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
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
3e41884765 Import translations. DO NOT MERGE
Change-Id: I55019ba1b073d0d11ac5faed3830207e2066b7e8
Auto-generated-cl: translation import
2012-10-28 12:40:31 -07: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
4cf289ad4d Merge "Wording change for Daydream setting" into jb-mr1-dev 2012-10-26 04:46:14 -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
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
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
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
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
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
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
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
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
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
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
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
Russell Brenner
26bb2398cf Merge "Fix layout with no access points" into jb-mr1-dev 2012-10-23 11:00:01 -07:00
Russell Brenner
e2acfde27c Fix layout with no access points
The "Searching for Wi-Fi" message was filling it's view parent,
pushing the "Other network..." option and Skip button out of view.

Bug: 7335738
Change-Id: I6fd1ceff67e04385c6e325ec4bb8a2e30f38c924
2012-10-23 10:45:03 -07:00
Daniel Sandler
b757ae62d5 am d5e1cf25: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit 'd5e1cf253eed7e95017542bcfa754948bee9b8f6':
  Dreams/Sleep Mode is now Daydreams.
2012-10-23 08:19:21 -07:00
Daniel Sandler
d5e1cf253e am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '769b4711c94cc9093012e51e0101659d712b99ee':
  Dreams/Sleep Mode is now Daydreams.
2012-10-23 08:17:17 -07:00
Daniel Sandler
769b4711c9 Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev 2012-10-23 08:15:48 -07:00
Daniel Sandler
3bdbf45316 Dreams/Sleep Mode is now Daydreams.
Bug: 7395321
Change-Id: Ifac4eca70e83c8b90e0cd2d16809dd117e279790
2012-10-23 01:22:36 -04:00
Amith Yamasani
efc9458b46 am 4f5555ab: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '4f5555ab9355e0b51a9858668aab8538e29d658c':
  Fixes an AIOOBE when device admin enforces a small timeout for screen lock
2012-10-22 18:01:19 -07:00
Amith Yamasani
4f5555ab93 am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit 'b80b8bb2535504bada0664a7255b5fa61c2c3947':
  Fixes an AIOOBE when device admin enforces a small timeout for screen lock
2012-10-22 17:59:10 -07:00