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

9311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
94308a8877 am a4197d13: am d1d9e350: am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a4197d13b9ca7325b604564c784abc7dccf5fa01':
 2012-10-31 19:39:36 -07:00
Baligh Uddin
95989e5526 am 723498fd: am eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '723498fd4a8366495003684b50b9bbced4fa26cd':
  Import translations. DO NOT MERGE
 2012-10-31 19:39:35 -07:00
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
Michael Jurka
6df9ce11ca am 0b2bd8d1: New widget picker for keyguard widgets 
* commit '0b2bd8d11d6947a6ce71db0691ba341aec7a2964':
  New widget picker for keyguard widgets
 2012-10-31 18:36:03 -07:00
Eric Laurent
a6843064be am 523d9dc4: am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev 
* commit '523d9dc460d3af22372860f4d3f83a4529257545':
 2012-10-31 18:36:02 -07:00
Justin Ho
a724bb1fac am 5da02a47: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev 
* commit '5da02a476944c6ca3672cf00265f7f163028a8c5':
 2012-10-31 18:36:00 -07:00
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
The Android Automerger
eed7a47758 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-31 18:34:23 -07:00
Dianne Hackborn
4de4061c8b Fix issue #7448596: Can't uninstall app that was installed by another user 
Change-Id: I6614346f8da80ffedd71645ee2920cf85b92c87c
 2012-10-31 18:12:03 -07:00
Michael Jurka
0b2bd8d11d New widget picker for keyguard widgets 
New layout for widget picker is still not up to
final design, but this change prepares all the
backend work

Also, remove use of features filter from the
picker, since this is being removed from the API

Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c
 2012-10-31 16:46:24 -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
523d9dc460 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:40 -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
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
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
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
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
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