Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,440 Commits 1 Branch 0 Tags
0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf
Commit Graph

8440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
0bccd7e7f4 am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '5f28c77bc64deb132082eaab0ebd544ba5111bd0':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:26:39 -07:00
Dianne Hackborn
5f28c77bc6 am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'd60861258169083f3174734af821fc8078ec5d2f':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:23:05 -07:00
Dianne Hackborn
d608612581 Fix issue #9074296: Device Admins can activate in a way... 
...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

(cherry picked from commit 8274b67702)

Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
  in the PackageManager.queryBroadcastReceivers invocation. The above
  constant was introduced in API Level 18 only. DeviceAdminSettings
  class from which this fix was extracted is not passing in the above
  flag when it invokes queryBroadcastReceivers either.

Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
 2013-06-05 15:48:20 -07:00
Jean-Baptiste Queru
8638eeb4e9 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:22:07 -07:00
Irfan Sheriff
f197105e3b Merge "Fix wifi compareTo" into jb-mr1-dev 2012-12-13 11:28:48 -08:00
Irfan Sheriff
ebc57e3ae6 Fix wifi compareTo 
Bug: 7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
 2012-12-13 11:00:24 -08:00
Baligh Uddin
42db418f96 Import translations. DO NOT MERGE 
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
 2012-11-27 14:21:30 -08:00
Baligh Uddin
4012997392 Import translations. DO NOT MERGE 
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
 2012-11-22 23:18:51 -08:00
Baligh Uddin
e71a8772bb Import translations. DO NOT MERGE 
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
 2012-11-21 00:04:32 -08:00
Baligh Uddin
7ed1879f28 Import translations. DO NOT MERGE 
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
 2012-11-16 15:51:59 -08:00
Baligh Uddin
add9d21f58 Import translations. DO NOT MERGE 
Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76
Auto-generated-cl: translation import
 2012-11-14 12:41:58 -08:00
Baligh Uddin
a0fbc220bb Import translations. DO NOT MERGE 
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
 2012-11-09 11:53:40 -08:00
The Android Automerger
79bf08d246 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 13:54:19 -08:00
Michael Jurka
d9609fc0a2 Fix jank after adding a widget for lock screen 
After adding a widget, you see a black flash, but
there's also a small sliver of wallpaper left
showing. This change covers up that small bit 
of wallpaper.

Bug: 7381803
 2012-11-07 16:54:46 -08:00
Michael Jurka
a108d9fc0e Final tweaks to visuals of widget picker 2012-11-07 15:32:23 -08:00
Baligh Uddin
c74ef2f28b am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
  Import translations. DO NOT MERGE
 2012-11-07 11:51:32 -08:00
Baligh Uddin
7d6a0f9c8b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-07 11:49:24 -08:00
The Android Automerger
01785cff5f merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 11:18:19 -08:00
Baligh Uddin
9d41995bd1 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 10:03:26 -08:00
Michael Jurka
f5336fd114 Allowing rotation while adding lockscreen widgets 
Also cleaning up some unused code

Bug: 7468012
 2012-11-07 01:12:04 -08:00
Michael Jurka
a487bca470 Updated layouts for keyguard widget picker 
Bug: 7381803

Change-Id: I9a6a8fe3216002b486e7b6ddf7544d9fc4e73de8
 2012-11-07 00:00:11 -08:00
Michael Jurka
c0fb8a399b Merge "Updated assets." into jb-mr1-lockscreen-dev 2012-11-06 21:10:21 -08:00
Daniel Sandler
06405ceaed Updated assets. 
Change-Id: Ib4e02eb1c43523e86ad8828835f76436ebb82506
 2012-11-07 00:03:34 -05:00
Michael Jurka
5c5eff45e9 Pass argument to lock screen to show widget 
after adding it
 2012-11-06 16:22:04 -08:00
Baligh Uddin
213cc46288 Import translations. DO NOT MERGE 
Change-Id: Iae38ab79b4108a612ed9048c7d3282c6287ae84b
Auto-generated-cl: translation import
 2012-11-06 16:13:52 -08:00
Baligh Uddin
fb4a71b7b0 Import translations. DO NOT MERGE 
Change-Id: I9e48644d4717391f86c10a609470c429769114e7
Auto-generated-cl: translation import
 2012-11-06 16:11:40 -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 Automerger
ce561a8a59 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 13:13:42 -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
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
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
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
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
f79daa9420 Merge "display audio dialog when connecting low end dock" into jb-mr1-dev 2012-10-30 14:12:23 -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