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

8878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
c0cd36ec8c Import translations. DO NOT MERGE 
Change-Id: Iad0dcfb3ccccfb814a7ba85ae346fe5dd3336d48
Auto-generated-cl: translation import
 2012-11-06 16:09:13 -08:00
Michael Jurka
4119788b1b Add widget previews to the key guard widget picker 
Bug: 7381803

Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0
 2012-11-06 15:14:03 -08:00
The Android Open Source Project
a60f3ae723 am 5a051a7f: Reconcile with jb-mr1-release - do not merge 
* commit '5a051a7f0af2e206afd8c1e765eb80690345a536':
 2012-11-06 13:29:17 -08:00
The Android Open Source Project
5a051a7f0a Reconcile with jb-mr1-release - do not merge 
Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5
 2012-11-06 13:26:57 -08:00
The Android Automerger
ce561a8a59 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 13:13:42 -08:00
Michael Jurka
b19c4ced11 am 701d8a0e: am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly 
* commit '701d8a0e1af9d667b5c03a30ffb275359f048415':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-06 12:46:14 -08:00
Michael Jurka
701d8a0e1a am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly 
* commit 'ab3472f5946c5dc3193c29513e31be7309ece378':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-06 12:38:24 -08:00
The Android Open Source Project
374808ea22 am f9bac006: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit 'f9bac00620691f281df42d390517da2e37df8749':
  Remove blank translation string from en-GB, so it can show English.
  Manually enter translations for msgid: 9014073093293520112
  Fix layout with no access points
  Added info about why Wi-Fi is required
  Show warnings when skipping Wi-Fi connection
  Fix regression in Bluetooth settings.
  Addressing issue where power control widget disappears issue 7205586
  Fix NPE in DeviceInfoSettings
  Fix a crash in InstalledAppDetails
  Tweaking mechanism for adding keyguard widgets
  Fix issue #7178865: Selecting an app from Settings > Apps>...
  Must initialize the new atomic..
  Fix crash in Settings > Security
  Wifi settings are in a different namespace now
  Update Settings app to use new namespace for airplane-mode settings
 2012-11-06 12:23:56 -08:00
The Android Open Source Project
f9bac00620 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: Ic248a0dc1baadcebad816f4870655a826fa7a5d7
 2012-11-06 12:18:44 -08:00
Michael Jurka
ab3472f594 Supporting EXTRA_APPWIDGET_OPTIONS correctly 2012-11-05 18:56:14 -08:00
The Android Automerger
bf3c225560 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:39:13 -08:00
Jim Miller
95b2db64d4 am fd34f989: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev 
* commit 'fd34f989608dc02b0cdfbb7012c4c824a5107ded':
  Disable the "none" security selection in settings when there's only 1 user
 2012-11-05 15:36:01 -08:00
Baligh Uddin
7c99551aac am 18facce4: am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '18facce4183adc1b058f9d04f3dfd3fe1e8fae2f':
 2012-11-05 15:36:00 -08:00
Baligh Uddin
94c4b78acb am ecfe5f0d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'ecfe5f0d4c31151ee8585ec5521ced2e6e6581b9':
  Import translations. DO NOT MERGE
 2012-11-05 15:35:55 -08:00
Baligh Uddin
50bfc55e41 am e3a4a5fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
  Import translations. DO NOT MERGE
 2012-11-05 14:11:57 -08:00
Jim Miller
fd34f98960 Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev 2012-11-04 18:28:35 -08:00
Baligh Uddin
18facce418 am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
  Import translations. DO NOT MERGE
 2012-11-04 17:52:56 -08:00
Baligh Uddin
ecfe5f0d4c Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-04 17:51:15 -08:00
Baligh Uddin
091c12c398 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-04 17:50:59 -08:00
Baligh Uddin
e3a4a5fde5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-04 17:50:45 -08:00
The Android Automerger
2df1470570 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-02 17:34:52 -07:00
Dianne Hackborn
b52e8ca60d am 4de4061c: Fix issue #7448596: Can\'t uninstall app that was installed by another user 
* commit '4de4061c8bb9475cbc5d98f83bf3b2c8ec222407':
  Fix issue #7448596: Can't uninstall app that was installed by another user
 2012-11-02 15:20:29 -07:00
Jim Miller
783ea85bec Disable the "none" security selection in settings when there's only 1 user 
Fixes bug 7454567

Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80
 2012-11-02 13:19:32 -07:00
Baligh Uddin
e5860279d8 Import translations. DO NOT MERGE 
Change-Id: I4aeb203952a8889425968e0e600f846d0a216c81
Auto-generated-cl: translation import
 2012-11-02 01:42:19 -07:00
Baligh Uddin
8b24ac004b Import translations. DO NOT MERGE 
Change-Id: I43bce84488cadd7c2c8637e9bac2fdf0d7a1ea58
Auto-generated-cl: translation import
 2012-11-02 01:40:39 -07:00
Baligh Uddin
3f5ba40054 Import translations. DO NOT MERGE 
Change-Id: I01e080a0c1111417cc502fa4fe126b1431763809
Auto-generated-cl: translation import
 2012-11-02 01:38:57 -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 Automerger
859ce033ec merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 20:12:35 -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
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
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