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

9304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6deb028a9e am b19c4ced: am 701d8a0e: am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly 
* commit 'b19c4ced11debd52313d9bfcb3b66dabba84b5b1':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-06 12:48:24 -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
51177f0c30 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I538dcad23578c67aac157ea9c60b5e27da195d69
 2012-11-06 12:37:59 -08:00
The Android Open Source Project
2197081fa0 am 374808ea: am f9bac006: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '374808ea223870c2ef12b009bbf6bb6b29a3d4b5':
 2012-11-06 12:29:51 -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
The Android Automerger
1d0f1b685a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:29:12 -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
75d6191e1f am 95b2db64: am fd34f989: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev 
* commit '95b2db64d4197883739e4b1be5ece409583ceb36':
  Disable the "none" security selection in settings when there's only 1 user
 2012-11-05 15:38:26 -08:00
Baligh Uddin
e386f32521 am 7c99551a: am 18facce4: am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7c99551aaca4f9f19c0d47d71ff6fc6a71a45ad2':
 2012-11-05 15:38:25 -08:00
Baligh Uddin
f5e9cca7a0 am 94c4b78a: am ecfe5f0d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '94c4b78acb387aa926a3fbdf4efd7b14e8edc45e':
  Import translations. DO NOT MERGE
 2012-11-05 15:38:24 -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
The Android Open Source Project
8926c73425 Reconcile with jb-mr1-release - do not merge 
Change-Id: I3275f5314289403f5cd8e8accceec4f38404c7d1
 2012-11-05 14:21:32 -08:00
Baligh Uddin
c82b385ba2 am 50bfc55e: am e3a4a5fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '50bfc55e4190a2ffdadd9a9eb318e5c948ba7e66':
  Import translations. DO NOT MERGE
 2012-11-05 14:15:12 -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
3a5acbd3fd am 091c12c3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '091c12c398143c6a128f5168f25e789150ffe6d6':
  Import translations. DO NOT MERGE
 2012-11-04 17:53:05 -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
eb6c6935f1 am b52e8ca6: am 4de4061c: Fix issue #7448596: Can\'t uninstall app that was installed by another user 
* commit 'b52e8ca60d28119ea5936245bd66edcd61c8da5e':
  Fix issue #7448596: Can't uninstall app that was installed by another user
 2012-11-02 15:23:25 -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
Amith Yamasani
797d620084 am f9a2f324: Merge "Changed the way that date format selector is shown." 
* commit 'f9a2f324d70cdbb4b0786f868ae01f99fe2734fb':
  Changed the way that date format selector is shown.
 2012-11-01 08:44:46 -07:00
Amith Yamasani
f9a2f324d7 Merge "Changed the way that date format selector is shown." 2012-11-01 08:19:32 -07:00
The Android Open Source Project
bfb6450503 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ic84ef2f21e05ef7e9606e0f9defc7865d248c59d
 2012-11-01 07:52:39 -07:00
Michael Jurka
98dc7952f3 am 6df9ce11: am 0b2bd8d1: New widget picker for keyguard widgets 
* commit '6df9ce11ca25ed0013c58dae34ac874322bd09fa':
  New widget picker for keyguard widgets
 2012-10-31 19:39:40 -07:00
Eric Laurent
8b1bde878a am a6843064: am 523d9dc4: am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev 
* commit 'a6843064be384ab46439cf236a9aa64b94e9acc6':
 2012-10-31 19:39:39 -07:00
Justin Ho
2695f611a6 am a724bb1f: am 5da02a47: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev 
* commit 'a724bb1facb2f2ccc44a21ff997cc5dbd90cc940':
 2012-10-31 19:39:38 -07:00
Jeff Sharkey
3af51f458f am 2eec33fe: am 58e97bf4: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 
* commit '2eec33fed79f0f902acc9afbf4433f00dbb6d2ce':
 2012-10-31 19:39:37 -07:00
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