PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,474 Commits 1 Branch 0 Tags
db922ac69186b4b0e44b0ef03589b4fb92b51ab2
Commit Graph

9474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5da02a4769 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:17:54 -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
Jeff Sharkey
dfe674d722 am 92fe12e6: am ea6f5051: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 
* commit '92fe12e657083ea5e254ac3e3e0f5649cd9872a2':
  Selectively enable bugreport in power menu.
 2012-10-30 10:11:17 -07:00
Baligh Uddin
1e516ec22a am 939d0f1d: (-s ours) am 5ba8c670: am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '939d0f1d72fe152e655a2c4768fb5f37e7545df3':
  Import translations. DO NOT MERGE
 2012-10-30 10:10:53 -07:00
Vikram Aggarwal
69db6b55b8 am 09b3127a: am 9ad7e7e3: am 8d028a87: Allow wireless charging during encrypt 
* commit '09b3127aad97efba5135f4a5d63b473586c850dc':
  Allow wireless charging during encrypt
 2012-10-30 10:10:50 -07:00
Baligh Uddin
0e4f6a67c7 am a2018c94: (-s ours) am 8ae40a07: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a2018c946f2f3940be3fbb6201e87a913c3491d1':
  Import translations. DO NOT MERGE
 2012-10-30 10:10:43 -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
Baligh Uddin
bb783c9890 am ef9e8203: (-s ours) am dd165551: am e42e7b85: Import translations. DO NOT MERGE 
* commit 'ef9e8203074f88d2dfa211877ab10331a011e932':
  Import translations. DO NOT MERGE
 2012-10-29 17:15:52 -07:00
Eric Laurent
5ff77a01b6 am 539d7c66: am 65b9944f: am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev 
* commit '539d7c66d624107816c62184ebd6eaede3715ac5':
  added dock audio settings for non bluetooth docks
 2012-10-29 17:15:51 -07: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
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
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
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
feb3d4524d Merge "Import translations. DO NOT MERGE" 2012-10-29 15:21:08 -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
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
868d5b9dee am d18a9238: am 586ba830: am 381df27c: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev 
* commit 'd18a923873e6e77bde8226ea80bac7052c4a92ef':
 2012-10-29 13:54:55 -07:00
Michael Jurka
3806e84bcf am f2aa0fff: am 87e7c274: am 8a4024ec: Add ability to add clock widget to keyguard 
* commit 'f2aa0fff88bc5801d107effbfb319593c6bd7a11':
  Add ability to add clock widget to keyguard
 2012-10-29 13:54:54 -07:00
Amith Yamasani
4679b85707 am b7babc9e: am a1e3586a: am 67920f06: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev 
* commit 'b7babc9ec96a90b589ca7026237f39d55b43d4da':
 2012-10-29 13:54:53 -07:00
Michael Jurka
9d56e71dca am 3b71b1ea: am 6576e1a7: am d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev 
* commit '3b71b1ea96759c21d85de9086281bb2901817c4e':
  Adding ability to add multiple keyguard widgets
 2012-10-29 13:54:51 -07:00
Baligh Uddin
bc523ae9f0 am b83b6f93: (-s ours) am 38ff9890: am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b83b6f932c751c0b68f4958e5f6afb76bf7c4540':
 2012-10-29 13:54:50 -07:00
Baligh Uddin
3d10864187 am 013987c7: (-s ours) am 0c31e078: am e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '013987c717291f948f074c05da02bfcfb2a14cec':
  Import translations. DO NOT MERGE
 2012-10-29 13:54:49 -07:00
Amith Yamasani
b54ea799f7 am 5e43f792: 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 '5e43f792c43e92794c9e669e434b8f7d8117cd98':
 2012-10-29 13:52:12 -07:00
Baligh Uddin
d70ad843b1 am 5facff2c: am 434b9c4f: am 06545e87: am e508a26e: Remove blank translation string from en-GB, so it can show English. 
* commit '5facff2cfe65eb1dd6020a82d4aedcab73ac43db':
 2012-10-29 13:52:11 -07:00
Baligh Uddin
ef7755fa67 am 90293772: am f6932aeb: am a7489954: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev 
* commit '90293772e77f16ff0c0ca7300781ba89493a3cff':
 2012-10-29 13:52:10 -07:00
Russell Brenner
64075913be am e456e557: am c0b22b0a: am 98f884b1: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev 
* commit 'e456e5577d29b7744850d1d3d35a1229fa993626':
 2012-10-29 13:52:09 -07:00
Daniel Sandler
d8f9792f54 am 16d7f777: am 96fcd6bb: am 25608dd1: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev 
* commit '16d7f7770cb16913633534b9a69eaa8b19e7696c':
 2012-10-29 13:52:08 -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
Amith Yamasani
0e38e361c6 am 15d10744: 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 '15d107441c05abc3e847fa0c270f2d6418f984e2':
 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
Baligh Uddin
082cbe2080 am 6de2c973: (-s ours) am 27c1348b: am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6de2c97369c9cdc4661ef3d5029689d63ad2b8c5':
 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
Baligh Uddin
fef0612c7c am 1013f910: (-s ours) am aee2ef0a: am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '1013f910cdb66190b91b3b28fb3a4b251c9287e8':
  Import translations. DO NOT MERGE
 2012-10-29 13:52:03 -07:00