PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,644 Commits 1 Branch 0 Tags
c3269ec2b0c3deb74b3f141512043c25d51b413c
Commit Graph

10644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
60544e74b6 am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
  Ensure all active Device Admins are listed.
 2013-06-06 15:26:48 -07:00
Alex Klyubin
efd88e2c46 Merge "Permit deactivation of malformed Device Admins." into jb-dev 2013-06-06 22:25:29 +00:00
Alex Klyubin
29de9d5153 Permit deactivation of malformed Device Admins. 
Bug: 9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
 2013-06-06 14:56:24 -07:00
Amith Yamasani
48b8b8fd18 Allow hidden apps to opt-out 
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.

Bug: 8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
 2013-06-06 14:48:07 -07:00
Jeff Sharkey
133581e267 Follow network stats changes. 
Now Wi-Fi and mobile traffic is recorded separately, which means we
can compute much more accurate usage estimates.

Bug: 5543387
Change-Id: I26120a219649a3c84806fab0fd1602ab07509410
 2013-06-06 14:35:37 -07:00
Alex Klyubin
3dddd8cbff Ensure all active Device Admins are listed. 
Bug: 9074296
(cherry picked from commit d14258e50e)

Conflicts:
	src/com/android/settings/DeviceAdminSettings.java

Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
  PackageManager.queryBroadcastReceivers invocation. The above
  flag was introduced in API Level 18.

Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
 2013-06-06 14:08:34 -07:00
Dianne Hackborn
d517d7405e am f750cdea: am adc3a282: am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'f750cdea06c72ef3fa78a07410fa742436d47bcd':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:56:54 -07:00
Dianne Hackborn
f750cdea06 am adc3a282: am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'adc3a2825c754084728193ebf4f88b411e5b3dbc':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:54:34 -07:00
Dianne Hackborn
adc3a2825c am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '9cd1d5e2c07248e9cc22721d9373ebf1fcf9dba2':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:51:50 -07:00
Dianne Hackborn
9cd1d5e2c0 am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:35:00 -07:00
Dianne Hackborn
a9a28d2fee am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'f96a86c99d7505e15a39266967cf4d4d75295af1':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:32:46 -07:00
Dianne Hackborn
f96a86c99d am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '6d80d477391c6ad14a6bcdb044c3351de4e20481':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:30:51 -07:00
Dianne Hackborn
6d80d47739 am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:29:04 -07:00
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
Amith Yamasani
13958b3a06 am f71f25db: am d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev 
* commit 'f71f25dbd6d92f688dc4f9b6b76ef1c3cd6523db':
  Fix NullPointerException at RunningState
 2013-06-06 11:24:21 -07:00
Amith Yamasani
f71f25dbd6 am d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev 
* commit 'd63bd61ee862db18677276b1a18b2d7938a5e193':
  Fix NullPointerException at RunningState
 2013-06-06 11:19:06 -07:00
Amith Yamasani
d63bd61ee8 Merge "Fix NullPointerException at RunningState" into jb-mr2-dev 2013-06-06 18:16:31 +00:00
The Android Open Source Project
ac968945e2 am 8548ddf2: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '8548ddf229d1438cff6904921af84814305a4ec5':
  Import translations. DO NOT MERGE
 2013-06-06 10:43:03 -07:00
The Android Open Source Project
8548ddf229 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I6d5d0cb4778ad82dd1943e6facc621f87b37ac28
 2013-06-06 10:37:41 -07:00
Johan Redestig
6fd5800386 Fix NullPointerException at RunningState 
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.

Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
 2013-06-06 10:26:22 -07:00
Jeff Sharkey
eab49cab9f Always allow formatting of physical storage. 
Also rebuild UI when volume state changes after a format finishes.

Bug: 8985206
Change-Id: I6208e385711b883fb6fc77cc76cbe425d740b0a8
 2013-06-05 17:52:03 -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
rich cannings
27d6f8d54b Add EventLog to report lock screen type 
Bug: 9075747
Change-Id: I7d3667211e76b13ccd659713c35ca86246e31e0b
 2013-06-05 13:01:44 -07:00
Baligh Uddin
c5d3b362b2 Import translations. DO NOT MERGE 
Change-Id: If919cad576edb7de1b37729c6986c85cc4a4a4ee
Auto-generated-cl: translation import
 2013-06-05 11:54:30 -07:00
Baligh Uddin
f616ef4306 Import translations. DO NOT MERGE 
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
 2013-06-05 11:51:21 -07:00
The Android Automerger
8db2adb980 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-05 10:21:50 -07:00
Baligh Uddin
9c14c8d7aa Import translations. DO NOT MERGE 
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
 2013-06-04 11:56:59 -07:00
Baligh Uddin
747f726caf am ac617824: (-s ours) am 804b8b60: Import translations. DO NOT MERGE 
* commit 'ac617824314daebb912d8fb6da5e1f2ed75da03b':
  Import translations. DO NOT MERGE
 2013-06-03 14:49:01 -07:00
Baligh Uddin
ac61782431 am 804b8b60: Import translations. DO NOT MERGE 
* commit '804b8b60e7784ebbf660cf4348de24c1b2ae7146':
  Import translations. DO NOT MERGE
 2013-06-03 14:34:56 -07:00
Baligh Uddin
e152e60a8f Merge "Import translations. DO NOT MERGE" 2013-06-03 21:34:15 +00:00
The Android Open Source Project
2a131742f7 am b30d81d1: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'b30d81d1dc265b0a1e59d92c996ab9734d272674':
 2013-06-03 14:07:22 -07:00
The Android Open Source Project
b30d81d1dc Reconcile with jb-mr2-release - do not merge 
Change-Id: I0c4c9a3c4d05abbbde1198c2f4d0ee170a2ef7e5
 2013-06-03 14:03:56 -07:00
Baligh Uddin
19fdfd5b1a Import translations. DO NOT MERGE 
Change-Id: Id2021f273ed726308df42cb5b90a66aa8582da40
Auto-generated-cl: translation import
 2013-06-03 11:51:17 -07:00
Baligh Uddin
804b8b60e7 Import translations. DO NOT MERGE 
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
 2013-06-03 11:48:00 -07:00
The Android Automerger
a778aa2499 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-02 05:55:48 -07:00
Baligh Uddin
bed7bada87 am 971d090a: (-s ours) am eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '971d090a374f5192eed256eda47d174fd8ab9c30':
  Import translations. DO NOT MERGE
 2013-06-01 09:51:53 -07:00
Baligh Uddin
971d090a37 am eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'eb0fff7a9a57202ce2a1f6fc43f6dab79e7e6d36':
  Import translations. DO NOT MERGE
 2013-06-01 08:23:29 -07:00
Baligh Uddin
4533b5413a Merge "Import translations. DO NOT MERGE" 2013-05-31 22:44:05 +00:00
Baligh Uddin
eb0fff7a9a Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-31 22:43:38 +00:00
Przemyslaw Szczepaniak
e0ca4792f7 Adding korean input for "Listen to an example" TTS 
Bug: 9186138
Change-Id: If5aed34d8ce34ef9922f8dbf0f9a83e26b931bd4
 2013-05-31 10:59:47 +01:00
Jean-Baptiste Queru
3734178c41 am 8527d6d1: am 46cd7f64: Ignore 81476405 from AOSP 
* commit '8527d6d194eb92a4f61696c0a7b298538f7cf87b':
  Settings: Fix Swedish translations
 2013-05-30 15:43:08 -07:00
Jean-Baptiste Queru
8527d6d194 am 46cd7f64: Ignore 81476405 from AOSP 
* commit '46cd7f64f00f530de4478137281c4d47d02c9244':
  Settings: Fix Swedish translations
 2013-05-30 15:39:39 -07:00
Jean-Baptiste Queru
46cd7f64f0 Ignore 81476405 from AOSP 2013-05-30 15:37:47 -07:00
Robert Greenwalt
c236091229 am f96cfad3: am 5ac90432: Don\'t show scan-always text if it is off. 
* commit 'f96cfad36ef62154b52e846736ebc407f4c03de6':
  Don't show scan-always text if it is off.
 2013-05-30 15:16:05 -07:00
Jean-Baptiste Queru
8147640558 Merge "Settings: Fix Swedish translations" 2013-05-30 22:06:37 +00:00
Robert Greenwalt
f96cfad36e am 5ac90432: Don\'t show scan-always text if it is off. 
* commit '5ac904321d81a0a0b7892c5722c464dc3c693f9f':
  Don't show scan-always text if it is off.
 2013-05-30 12:06:30 -07:00
Robert Greenwalt
5ac904321d Don't show scan-always text if it is off. 
bug:9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
 2013-05-30 11:33:36 -07:00
Baligh Uddin
d5bc04c03f Import translations. DO NOT MERGE 
Change-Id: I5cf93cb32c6e8ceebe3172192d30114d84305993
Auto-generated-cl: translation import
 2013-05-29 19:32:14 -07:00
Baligh Uddin
586376a036 Import translations. DO NOT MERGE 
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
 2013-05-29 19:29:10 -07:00