PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,524 Commits 1 Branch 0 Tags
ed3e89abe50425f50bce2880bff86a6e38772f10
Commit Graph

8524 Commits

This Branch
This Branch
All Branches
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
3e41884765 Import translations. DO NOT MERGE 
Change-Id: I55019ba1b073d0d11ac5faed3830207e2066b7e8
Auto-generated-cl: translation import
 2012-10-28 12:40:31 -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
103f74b55f Import translations. DO NOT MERGE 
Change-Id: Ie1bf43d9ee2b5a3008e0d1be25329fc56ed633af
Auto-generated-cl: translation import
 2012-10-25 10:41: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
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
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
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
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
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
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
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
Amith Yamasani
b80b8bb253 Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev 2012-10-22 17:56:54 -07:00
Amith Yamasani
64516a191f Fixes an AIOOBE when device admin enforces a small timeout for screen lock 
Bug: 7378871

If the timeout choices are empty, set an empty summary.

Change-Id: I20dbe61af56f9c41337a7c284580511322e5a45e
 2012-10-22 16:38:02 -07:00
Baligh Uddin
2d9629557d am a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
  Import translations. DO NOT MERGE
 2012-10-22 14:01:54 -07:00
Baligh Uddin
a7acb166b2 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-22 13:58:38 -07:00
Baligh Uddin
aeeba258e1 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-22 13:58:21 -07:00
Baligh Uddin
3a7fd50408 Import translations. DO NOT MERGE 
Change-Id: Ia49c8378454cc2af782efffce6aa70c60568f3fd
Auto-generated-cl: translation import
 2012-10-22 12:09:26 -07:00
Baligh Uddin
4a3bed0cf9 Import translations. DO NOT MERGE 
Change-Id: I94a7973ca3611509deb3847b4bc211196f12ca30
Auto-generated-cl: translation import
 2012-10-22 12:07:22 -07:00
Guang Zhu
6a07244fa8 am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev 
* commit 'a023f4f6404027c3525af2cc48535a208e33b1d8':
  Prevent sync state changes when user is a monkey
 2012-10-22 11:53:23 -07:00
Guang Zhu
a023f4f640 Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev 2012-10-22 11:50:39 -07:00
Guang Zhu
167ba2af93 Prevent sync state changes when user is a monkey 
Bug: 7385019

Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
 2012-10-22 11:37:31 -07:00
Russell Brenner
5c412204a6 am 56a166e9: Added info about why Wi-Fi is required 
* commit '56a166e9e3cac96246bd724ceea96846fc9e41e1':
  Added info about why Wi-Fi is required
 2012-10-21 08:05:12 -07:00
Russell Brenner
56a166e9e3 Added info about why Wi-Fi is required 
Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.

Bug: 7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
 2012-10-19 18:55:14 -07:00
John Spurlock
76f99688cf am d983e1d1: Settings: Use new shared dream setting defaults. 
* commit 'd983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
  Settings: Use new shared dream setting defaults.
 2012-10-19 11:05:49 -07:00
John Spurlock
d983e1d1a5 Settings: Use new shared dream setting defaults. 
Bug:7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
 2012-10-19 11:27:22 -04:00
Jeff Sharkey
0d4fd237ea am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
  More migration to Global settings.
 2012-10-18 23:26:08 -07:00
Jeff Sharkey
5a740ab1b9 Merge "More migration to Global settings." into jb-mr1-dev 2012-10-18 23:23:08 -07:00
Romain Guy
6dc2c7a535 am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 
* commit '8b98246559c7422e507458a63c8dfc2783bd0afc':
  Control OpenGL traces from Developer Options in Settings
 2012-10-18 18:12:03 -07:00
Romain Guy
8b98246559 Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 2012-10-18 18:09:49 -07:00
Romain Guy
025cafcfa1 Control OpenGL traces from Developer Options in Settings 
This change adds a new entry to the developer options screen in
settings that lets you choose what OpenGL traces you want.

Change-Id: Ie789fa20dbbabee1e509b697106072464e9f9d2b
 2012-10-18 17:37:43 -07:00
Jeff Sharkey
860eceba2c More migration to Global settings. 
Bug: 7375796
Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
 2012-10-18 15:38:42 -07:00