Commit Graph

4718 Commits

Author SHA1 Message Date
Alex Klyubin
5d21820a97 am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit 'a65fa934f19ebfe59a8458be733e783292ad8d9c':
  Permit deactivation of malformed Device Admins.
2013-06-06 15:35:41 -07:00
Alex Klyubin
5aa3f87824 am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
* commit '0c32da7ee01f7f523a889c5faf1a449e664f8bce':
  Ensure all active Device Admins are listed.
2013-06-06 15:35:34 -07:00
Alex Klyubin
8d5aeffa7d am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '089d161588f07862ac1e8876a39227e4110b2bec':
  Permit deactivation of malformed Device Admins.
2013-06-06 15:29:56 -07:00
Alex Klyubin
9f6a193394 am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
* commit '0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
  Ensure all active Device Admins are listed.
2013-06-06 15:29:56 -07:00
Alex Klyubin
089d161588 am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
  Permit deactivation of malformed Device Admins.
2013-06-06 15:28:53 -07:00
Alex Klyubin
0ffbbad5b1 am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
* commit '60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
  Ensure all active Device Admins are listed.
2013-06-06 15:28:52 -07:00
Alex Klyubin
01dbfbf9c3 am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit 'efd88e2c468db2169ff9bb17f2b89c246756dcda':
  Permit deactivation of malformed Device Admins.
2013-06-06 15:26:49 -07:00
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
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
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
d63bd61ee8 Merge "Fix NullPointerException at RunningState" into jb-mr2-dev 2013-06-06 18:16:31 +00: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
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
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
Svetoslav
3303e77631 Merge "Remove Auto-rotate screen setting if a required feature is missing." 2013-05-29 22:09:18 +00:00
Amith Yamasani
03eed8ec3f Merge "Reduce jank in User Settings" 2013-05-29 16:42:15 +00:00
Amith Yamasani
e9c3c28f68 Merge "Cache default circle avatar for faster creation of UserSettings" 2013-05-29 16:42:00 +00:00
Amith Yamasani
f14e6751c3 Reduce jank in User Settings
Don't recreate the list on resume.
Cache the default circled icon.

Bug: 8802380
Change-Id: I46520b591fc3ffd5e51a1c7dda86e811c03a76a2
2013-05-29 09:39:07 -07:00
Russell Brenner
aa0b0b19e9 am 1f9e42cd: am c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev
* commit '1f9e42cd4054aaf02b01cc3937924a08aa6b7529':
  Improved logic for Skip warning message
2013-05-28 13:51:03 -07:00
Russell Brenner
1f9e42cd40 am c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev
* commit 'c280acc327fa7e8fbd6972534fbadb4650c1ee3d':
  Improved logic for Skip warning message
2013-05-28 13:23:35 -07:00
Russell Brenner
c280acc327 Merge "Improved logic for Skip warning message" into jb-mr2-dev 2013-05-28 20:22:40 +00:00
Amith Yamasani
503783c482 Cache default circle avatar for faster creation of UserSettings
Change-Id: Ie2ed9d032f71fad7a89edde147f231a1dc479aae
2013-05-28 11:17:43 -07:00
Russell Brenner
765f55f52a Improved logic for Skip warning message
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.

Bug: 9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
2013-05-24 16:09:39 -07:00
Amith Yamasani
99f40d4758 am 73662629: am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
* commit '73662629957e03ef23cd1bc33640ce7d1e690e90':
  Update strings for clarity about restricted profiles
2013-05-22 15:08:53 -07:00
Amith Yamasani
7366262995 am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
* commit '21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
  Update strings for clarity about restricted profiles
2013-05-22 15:07:00 -07:00
Amith Yamasani
21f008e1f4 Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 2013-05-22 22:04:59 +00:00
Alex Klyubin
20c94a627b am 1eb2064f: am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
* commit '1eb2064ff495b60bbf5db1a188adcad2e677742b':
  Ensure all active Device Admins are listed.
2013-05-22 14:10:50 -07:00
Alex Klyubin
1eb2064ff4 am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
* commit '7229e29f1749ae10bd92b59ec3d663698a5045e7':
  Ensure all active Device Admins are listed.
2013-05-22 14:09:10 -07:00
Alex Klyubin
7229e29f17 Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 2013-05-22 21:06:32 +00:00
Dianne Hackborn
be6e37a7e8 am eeeccdc6: am 8274b677: Fix issue #9074296: Device Admins can activate in a way...
* commit 'eeeccdc6a3ab5640233ff46dc8864c1235687f09':
  Fix issue #9074296: Device Admins can activate in a way...
2013-05-22 14:03:05 -07:00
Dianne Hackborn
eeeccdc6a3 am 8274b677: Fix issue #9074296: Device Admins can activate in a way...
* commit '8274b6770219a469ab8a5254206d0d81bd5c96d3':
  Fix issue #9074296: Device Admins can activate in a way...
2013-05-22 14:01:26 -07:00
Amith Yamasani
7c4dfccda4 Update strings for clarity about restricted profiles
Bug: 9051422
Bug: 9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
2013-05-22 12:51:30 -07:00
Dianne Hackborn
8274b67702 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.

Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
2013-05-22 11:50:23 -07:00
Alex Klyubin
d14258e50e Ensure all active Device Admins are listed.
Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
2013-05-22 09:08:53 -07:00
Amith Yamasani
d08167e169 am 18d44684: am 0b2781ae: Write restriction bundle right away for required apps.
* commit '18d44684d3d384cc1eed114808c3870c7738e352':
  Write restriction bundle right away for required apps.
2013-05-21 18:20:36 -07:00
Amith Yamasani
18d44684d3 am 0b2781ae: Write restriction bundle right away for required apps.
* commit '0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
  Write restriction bundle right away for required apps.
2013-05-21 18:16:50 -07:00
Amith Yamasani
0b2781ae53 Write restriction bundle right away for required apps.
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.

The app entry is also automatically removed from the list if there are no visible
restrictions.

Bug: 9074051

Also fix an incorrect dialog label. Bug: 9068877

Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
2013-05-21 16:07:28 -07:00
Przemyslaw Szczepaniak
6dcdfab906 Make TTS language setting track system language.
TTS engine default locale is set independently from the system locale.
If TTS engine default locale is not set, it defaults to the system locale.
If user decides to set TTS locale, ability to default to the current system
locale is lost (until device is wiped).

This change makes settings wipe the TTS engine default locale value if user
selects language that is system language. This allows TTS to track system
language if user changes it.

If system language is not available in TTS, language field is set to
"language not selected" value.

This change require a small change in framework/base to make previously
private method public (TtsEngines.getDefaultLocale).

+ Selected language is displayed in language preference summary (matches
all other language preferences)
+ Removing and then adding "language" and 'install languages' preferences
looks glitchy, not they are disabled (grayed out) if unavailable.

Bug: 8613986
Change-Id: Ic4bde97ef7406adb64cc03efbe660275360ba3af
2013-05-21 12:30:21 +00:00
Dmitry Shmidt
304070968a Merge "Disable On/OFF switch before action" 2013-05-21 01:18:08 +00:00