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

8942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikram Aggarwal
44db00933f am a27e1cb2: am ee284023: am 8d028a87: Allow wireless charging during encrypt 
* commit 'a27e1cb204e2d61588ea4004790f02f7ced4bd0e':
 2012-10-31 19:39:33 -07:00
Baligh Uddin
b6413e1666 am a10a75ca: am 910fe047: am e42e7b85: (-s ours) Import translations. DO NOT MERGE 
* commit 'a10a75ca16eda40ce6ae171b56e2fddafb13331d':
 2012-10-31 19:39:31 -07:00
Baligh Uddin
5318e5d916 am f706edfb: am 9ad78e88: (-s ours) Import translations. DO NOT MERGE 
* commit 'f706edfbd4756173ce802aec53ce14ee730b87dd':
  Import translations. DO NOT MERGE
 2012-10-31 19:39:30 -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
The Android Open Source Project
d8515a1d78 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I40ce39e6f067e352b19562897b2baf2bab3b6a39
 2012-10-31 09:18:37 -07:00
The Android Automerger
859ce033ec merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 20:12:35 -07:00
Eric Laurent
ebcfb8e8d8 am d6287242: am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev 
* commit 'd6287242c260352baf649515fb5c6f170af5f397':
  display audio dialog when connecting low end dock
 2012-10-30 14:15:32 -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
749ec9fc21 am d1c99a3d: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev 
* commit 'd1c99a3d7ec7be0ae5a43e7cb3db96f59d701ac3':
  Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
 2012-10-30 11:20:28 -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
The Android Automerger
82c45c7019 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 08:53:03 -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
92fe12e657 am ea6f5051: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 
* commit 'ea6f50515620c4ab5abefeca8431505b05db9672':
  Selectively enable bugreport in power menu.
 2012-10-29 16:38:52 -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
939d0f1d72 am 5ba8c670: am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '5ba8c670a95dc54f3d384c91a2719a06c706d4ce':
  Import translations. DO NOT MERGE
 2012-10-29 15:28:01 -07:00
Vikram Aggarwal
09b3127aad am 9ad7e7e3: am 8d028a87: Allow wireless charging during encrypt 
* commit '9ad7e7e3dabc0c0125f1373164857e8782e443dd':
  Allow wireless charging during encrypt
 2012-10-29 15:28:00 -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
a2018c946f am 8ae40a07: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '8ae40a07a4b8d9c9ccd73a6eba5ac62be3b8b5ef':
  Import translations. DO NOT MERGE
 2012-10-29 15:22:57 -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
ef9e820307 am dd165551: am e42e7b85: Import translations. DO NOT MERGE 
* commit 'dd16555147ec31734b755312d954342d02621587':
  Import translations. DO NOT MERGE
 2012-10-29 14:31:31 -07:00
Eric Laurent
539d7c66d6 am 65b9944f: am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev 
* commit '65b9944f5c330f0d623a7fb059566eda942c7045':
  added dock audio settings for non bluetooth docks
 2012-10-29 14:31:30 -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
d18a923873 am 586ba830: am 381df27c: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev 
* commit '586ba830bc4fe4b8617564dac3afb71d78bdb713':
 2012-10-29 13:52:06 -07:00
Michael Jurka
f2aa0fff88 am 87e7c274: am 8a4024ec: Add ability to add clock widget to keyguard 
* commit '87e7c274f26b078ddc7bcab783cecbcc0251c86b':
  Add ability to add clock widget to keyguard
 2012-10-29 13:52:04 -07:00
Amith Yamasani
b7babc9ec9 am a1e3586a: am 67920f06: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev 
* commit 'a1e3586a96de17f2a23b5e7bb9e7fff65d6ded3b':
 2012-10-29 13:52:03 -07:00
Michael Jurka
3b71b1ea96 am 6576e1a7: am d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev 
* commit '6576e1a778c38039d7a4609f72fe892b8f70e2c7':
  Adding ability to add multiple keyguard widgets
 2012-10-29 13:51:59 -07:00
Baligh Uddin
b83b6f932c am 38ff9890: am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '38ff9890ba9b165657562534d402a454d1d0efd3':
 2012-10-29 13:51:57 -07:00
Baligh Uddin
013987c717 am 0c31e078: am e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '0c31e078d6a8337e002b084769caa94c199fe10f':
  Import translations. DO NOT MERGE
 2012-10-29 13:51:55 -07:00
Amith Yamasani
5e43f792c4 am b14659eb: am c250ae9d: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev 
* commit 'b14659eb1ad147e1b0046df1a23042df681ddcbc':
 2012-10-29 13:42:04 -07:00
Baligh Uddin
5facff2cfe am 434b9c4f: am 06545e87: am e508a26e: Remove blank translation string from en-GB, so it can show English. 
* commit '434b9c4ff7c32fd69974ba77be1bc3eb210464a1':
 2012-10-29 13:42:02 -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
Baligh Uddin
90293772e7 am f6932aeb: am a7489954: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev 
* commit 'f6932aebd428a35f2973d2ddda2459c179021b9f':
 2012-10-29 13:42:01 -07:00
Russell Brenner
e456e5577d am c0b22b0a: am 98f884b1: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev 
* commit 'c0b22b0a3590338e1203912822d84dfdc8730706':
 2012-10-29 13:42:00 -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
Daniel Sandler
16d7f7770c am 96fcd6bb: am 25608dd1: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev 
* commit '96fcd6bb3d07eeccd4a1105cfa9a2e32ddb523ca':
 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
Amith Yamasani
15d107441c am d379946b: am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev 
* commit 'd379946bca8dd7cf91707698aa15f2a8b5514d03':
 2012-10-29 13:41:58 -07:00
Baligh Uddin
6de2c97369 am 27c1348b: am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '27c1348b43125cf31e84ed93987989c6d37d5cb7':
 2012-10-29 13:41:57 -07:00
Baligh Uddin
1013f910cd am aee2ef0a: am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'aee2ef0a848d8008eda92a0f1fbdcb65af0490ce':
  Import translations. DO NOT MERGE
 2012-10-29 13:41:56 -07:00