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

8617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
2eec33fed7 am 58e97bf4: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 
* commit '58e97bf41f1ee38d401146553d3de8678b437b8b':
 2012-10-31 18:35:59 -07:00
Baligh Uddin
a4197d13b9 am d1d9e350: am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd1d9e350452e1147f9a0c5b312f869f652fb9722':
 2012-10-31 18:35:57 -07:00
Baligh Uddin
723498fd4a am eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'eb70ca293a2edbba128a74bb268089f4a59e1c75':
  Import translations. DO NOT MERGE
 2012-10-31 18:35:56 -07:00
Vikram Aggarwal
a27e1cb204 am ee284023: am 8d028a87: Allow wireless charging during encrypt 
* commit 'ee2840231ce60fcc7ae2f0fa045ffa94a2877c90':
 2012-10-31 18:35:54 -07:00
Baligh Uddin
a10a75ca16 am 910fe047: am e42e7b85: (-s ours) Import translations. DO NOT MERGE 
* commit '910fe0479a07df0f3a2eaeee4d1191c9f32ea5c9':
 2012-10-31 18:35:48 -07:00
Baligh Uddin
f706edfbd4 am 9ad78e88: (-s ours) Import translations. DO NOT MERGE 
* commit '9ad78e880f98fdf53cb40bcdcf0f9af3ea795bc6':
  Import translations. DO NOT MERGE
 2012-10-31 18:35:31 -07:00
Eric Laurent
d6287242c2 am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev 
* commit 'f79daa942005608e56a4a0d7f414fedccd56e467':
  display audio dialog when connecting low end dock
 2012-10-30 14:14:14 -07:00
Eric Laurent
f79daa9420 Merge "display audio dialog when connecting low end dock" into jb-mr1-dev 2012-10-30 14:12:23 -07:00
Justin Ho
d1c99a3d7e am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev 
* commit '29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
  Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
 2012-10-30 11:18:26 -07:00
Justin Ho
29c4c88be2 Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev 2012-10-30 11:16:45 -07:00
Eric Laurent
f892bc856c display audio dialog when connecting low end dock 
Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.

Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.

Bug 7302106.

Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
 2012-10-30 10:41:46 -07:00
Daniel Sandler
bcebe48f67 Whoops, missed a 'Sleep Mode' -> 'Daydream' string. 
Change-Id: I7ed00811e2c31459aaa32336dba4ff75b095f5ef
 2012-10-30 09:59:16 -04:00
Jeff Sharkey
58e97bf41f am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 
* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
  Selectively enable bugreport in power menu.
 2012-10-29 16:37:17 -07:00
Jeff Sharkey
ea6f505156 am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 
* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
  Selectively enable bugreport in power menu.
 2012-10-29 16:36:38 -07:00
Jeff Sharkey
c2c9d5bde1 Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 2012-10-29 16:35:08 -07:00
Baligh Uddin
5ba8c670a9 am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
  Import translations. DO NOT MERGE
 2012-10-29 15:25:25 -07:00
Vikram Aggarwal
9ad7e7e3da am 8d028a87: Allow wireless charging during encrypt 
* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
  Allow wireless charging during encrypt
 2012-10-29 15:25:19 -07:00
Baligh Uddin
d1d9e35045 am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
  Import translations. DO NOT MERGE
 2012-10-29 15:22:47 -07:00
Baligh Uddin
eb70ca293a Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-29 15:20:30 -07:00
Baligh Uddin
2e0679ed54 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-29 15:19:59 -07:00
Baligh Uddin
8ae40a07a4 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-29 15:19:34 -07:00
Vikram Aggarwal
ee2840231c am 8d028a87: Allow wireless charging during encrypt 
* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
  Allow wireless charging during encrypt
 2012-10-29 15:14:23 -07:00
Jeff Sharkey
2817c46c04 Selectively enable bugreport in power menu. 
The underlying bugreport init service depends on USB debugging being
turned on for user builds.  This change makes the developer options
UI reflect this constraint.

Bug: 7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081
 2012-10-29 14:57:41 -07:00
Baligh Uddin
dd16555147 am e42e7b85: Import translations. DO NOT MERGE 
* commit 'e42e7b85285963cd959cec701689deaefbe44898':
  Import translations. DO NOT MERGE
 2012-10-29 14:12:10 -07:00
Eric Laurent
65b9944f5c am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev 
* commit '79b7fdd2c0682f59f3a0899041b470cc02154219':
  added dock audio settings for non bluetooth docks
 2012-10-29 14:02:27 -07:00
Daniel Sandler
586ba830bc am 381df27c: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev 
* commit '381df27cd69c9c7315556c1dc40403118f7c585a':
 2012-10-29 13:42:01 -07:00
Michael Jurka
87e7c274f2 am 8a4024ec: Add ability to add clock widget to keyguard 
* commit '8a4024ecac34515947b185c153e1055549713b38':
  Add ability to add clock widget to keyguard
 2012-10-29 13:41:59 -07:00
Amith Yamasani
a1e3586a96 am 67920f06: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev 
* commit '67920f0639681cb5e5bc193688e4fc1c7419c872':
 2012-10-29 13:41:58 -07:00
Michael Jurka
6576e1a778 am d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev 
* commit 'd4362b7d356f1f33e1752be68c149b1cd95d8463':
  Adding ability to add multiple keyguard widgets
 2012-10-29 13:41:52 -07:00
Baligh Uddin
38ff9890ba am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ed49b6fc39eeeae00218924e47a206720e365501':
 2012-10-29 13:41:40 -07:00
Baligh Uddin
0c31e078d6 am e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'e00f034ec7badd18a7c4d3a36ed6bb6a0ab7438a':
  Import translations. DO NOT MERGE
 2012-10-29 13:41:29 -07:00
Amith Yamasani
b14659eb1a am c250ae9d: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev 
* commit 'c250ae9d712d7ba4b771ea8414876b9007a8da24':
 2012-10-29 13:39:30 -07:00
Baligh Uddin
434b9c4ff7 am 06545e87: am e508a26e: Remove blank translation string from en-GB, so it can show English. 
* commit '06545e87b5db25abcdb5790c082fca894db9d664':
 2012-10-29 13:39:29 -07:00
Baligh Uddin
f6932aebd4 am a7489954: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev 
* commit 'a7489954019f0d451e0f63b8c39a6e06a9f83002':
 2012-10-29 13:39:28 -07:00
Russell Brenner
c0b22b0a35 am 98f884b1: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev 
* commit '98f884b19575e65702286820be58959c12f59815':
 2012-10-29 13:39:26 -07:00
Daniel Sandler
96fcd6bb3d am 25608dd1: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev 
* commit '25608dd1a1fb03ed0b25eeb5966175dc6c620caa':
 2012-10-29 13:39:25 -07:00
Amith Yamasani
d379946bca am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev 
* commit '7ff9d5e100eb9a730c6f390eef04b6172e9d4288':
 2012-10-29 13:39:24 -07:00
Baligh Uddin
27c1348b43 am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '5fb549bf5f21cb240b4af35779e291d5d48f0109':
 2012-10-29 13:39:23 -07:00
Baligh Uddin
aee2ef0a84 am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '350ea07ca8e650bf167491deefdb421a183bbedd':
  Import translations. DO NOT MERGE
 2012-10-29 13:39:21 -07:00
Guang Zhu
bb15cfbd11 am 09a728a2: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev 
* commit '09a728a2a919f5ec0c1bad9d3953f4bdc4bf52c2':
 2012-10-29 13:36:43 -07:00
Russell Brenner
1a15dcb1a2 am 3fd05c88: am 56a166e9: Added info about why Wi-Fi is required 
* commit '3fd05c8853d67b273096dbbb7df6666273829ed5':
 2012-10-29 13:36:42 -07:00
John Spurlock
7c9b067bb1 am 5586afe0: am d983e1d1: Settings: Use new shared dream setting defaults. 
* commit '5586afe0eb5b4d6fba04f76d2a589164c526614f':
 2012-10-29 13:36:41 -07:00
Jeff Sharkey
717ad24a82 am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '9d0fbd728e93de2b6b08a68d5843f47d180e46e8':
 2012-10-29 13:36:40 -07:00
Romain Guy
4d92c702b5 am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 
* commit '7caa7515f8673d9516620d2a5147be9e2233f1bb':
 2012-10-29 13:36:38 -07:00
Zhihai Xu
79cc26f24c am ac8cfd0b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 
* commit 'ac8cfd0b9c4814e286e5147f90b80d295380a4a7':
 2012-10-29 13:36:37 -07:00
Daniel Sandler
653e5f9bc8 am 8b6036c3: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev 
* commit '8b6036c3fb4ebaf63026c658fb6871e4f11ed070':
 2012-10-29 13:36:36 -07:00
Fabrice Di Meglio
c5f7937e06 am 17edbf38: am c14d1134: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev 
* commit '17edbf38d7d4efe2ca6526d1538136f4cd116509':
 2012-10-29 13:36:35 -07:00
Baligh Uddin
c2e65ef38e am 67a54eaa: (-s ours) am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '67a54eaa812f1904c8e6dc17cc0888d252b53d3f':
 2012-10-29 13:36:33 -07:00
Brian Muramatsu
e447debbd8 am 0bfd02b0: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev 
* commit '0bfd02b05e1753703459bb2fdb3f9857a8b17d0d':
 2012-10-29 13:35:02 -07:00
John Huang
2a43340ddb am ff11f09a: am 50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev 
* commit 'ff11f09af0fbfd0c42644cb6e262c29920d6ee5d':
 2012-10-29 13:34:57 -07:00