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

9713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
3465b67740 Add support for per-package policy for sending premium SMS. 
The default behavior for sending a message to a premium SMS
short code (or suspected premium SMS number) is to ask the user for
confirmation. Enable the user to set a default policy ("remember this
choice" checkbox) to always/never allow the app to send SMS to
premium short codes in the future. The policy can be changed by
the Settings app in the app info screen.

Bug: 5513975
Change-Id: I93053fef1524ee7772cc87364c760cb3dbf01ad7
 2012-09-14 16:47:04 -07:00
rich cannings
70b37e77c7 am b2f4efb7: Correct strings for Plaform Anti-malware 
* commit 'b2f4efb7a8bacabecaa886cb6b561019630871d9':
  Correct strings for Plaform Anti-malware
 2012-09-14 16:06:14 -07:00
rich cannings
d86d972894 am b2f4efb7: Correct strings for Plaform Anti-malware 
* commit 'b2f4efb7a8bacabecaa886cb6b561019630871d9':
  Correct strings for Plaform Anti-malware
 2012-09-14 16:06:14 -07:00
rich cannings
b2f4efb7a8 Correct strings for Plaform Anti-malware 
Set strings to:

  Verify apps
  Disallow or warn before installation of apps that may cause harm

Bug: 7168682
Change-Id: Ic0102dd82ec26dd7239eaeaa7daa2b2f47fd6365
 2012-09-14 14:35:18 -07:00
Michael Jurka
38f531c574 am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev 
* commit 'bc7f678cc9334ef9d45a220fd0ef2db9c31019dc':
  Fix crash in Settings > Security
 2012-09-14 14:13:58 -07:00
Michael Jurka
b0d2252897 am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev 
* commit 'bc7f678cc9334ef9d45a220fd0ef2db9c31019dc':
  Fix crash in Settings > Security
 2012-09-14 14:13:55 -07:00
Michael Jurka
bc7f678cc9 Merge "Fix crash in Settings > Security" into jb-mr1-dev 2012-09-14 14:12:14 -07:00
The Android Automerger
19487f3836 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 14:10:50 -07:00
Michael Jurka
ce72ec7921 Fix crash in Settings > Security 
Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
 2012-09-14 14:09:16 -07:00
Baligh Uddin
4a44ed7bd7 Import translations. DO NOT MERGE 
Change-Id: I07c9987422c8e957459b8425f49d1e1fbd25190c
Auto-generated-cl: translation import
 2012-09-14 13:50:27 -07:00
Amith Yamasani
0322512b7f am 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev 
* commit '767597b28aebf46e42f7ce194acc09454d8d2324':
  Watch for profile changes and push to user manager
 2012-09-14 13:08:37 -07:00
Amith Yamasani
d477204da5 am 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev 
* commit '767597b28aebf46e42f7ce194acc09454d8d2324':
  Watch for profile changes and push to user manager
 2012-09-14 13:08:30 -07:00
Amith Yamasani
767597b28a Merge "Watch for profile changes and push to user manager" into jb-mr1-dev 2012-09-14 13:07:11 -07:00
Jeff Sharkey
949ea299ad am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev 
* commit '3a932f33223e54d619014afa3e34799bc6256b69':
  Treat cache storage usage as available space.
 2012-09-14 13:05:04 -07:00
Jeff Sharkey
93588f6323 am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev 
* commit '3a932f33223e54d619014afa3e34799bc6256b69':
  Treat cache storage usage as available space.
 2012-09-14 13:04:58 -07:00
Jeff Sharkey
3a932f3322 Merge "Treat cache storage usage as available space." into jb-mr1-dev 2012-09-14 13:03:27 -07:00
Jeff Sharkey
ec6e662688 Treat cache storage usage as available space. 
Bug: 7123160
Change-Id: I1b3f36622be557d7c47f1452832f67da40893a02
 2012-09-14 13:01:52 -07:00
Michael Jurka
37afcdc51b am 8227e303: Add support for setting lock widgets 
* commit '8227e303850d7c1162c62947b70d0592432b455e':
  Add support for setting lock widgets
 2012-09-14 12:47:01 -07:00
Michael Jurka
a733a653f6 am 8227e303: Add support for setting lock widgets 
* commit '8227e303850d7c1162c62947b70d0592432b455e':
  Add support for setting lock widgets
 2012-09-14 12:47:00 -07:00
Michael Jurka
8227e30385 Add support for setting lock widgets 
Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
 2012-09-14 12:44:20 -07:00
Michael Jurka
0150b90ec4 am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 
* commit 'a92861471d41a6cfae0c7e6825d02398fdbd0b42':
  Adding ability to filter for certain types of widgets in picker activity
 2012-09-14 12:21:49 -07:00
Michael Jurka
6940216295 am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 
* commit 'a92861471d41a6cfae0c7e6825d02398fdbd0b42':
  Adding ability to filter for certain types of widgets in picker activity
 2012-09-14 12:21:43 -07:00
Michael Jurka
a92861471d Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 2012-09-14 12:19:40 -07:00
Robert Greenwalt
0aff67acca am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 
* commit '9310f85dc7f5421f9ca6b1d644c8ddff792e8f37':
  Protect self from async change of BluetoothPan
 2012-09-14 10:55:54 -07:00
Robert Greenwalt
1495043cde am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 
* commit '9310f85dc7f5421f9ca6b1d644c8ddff792e8f37':
  Protect self from async change of BluetoothPan
 2012-09-14 10:55:47 -07:00
Robert Greenwalt
9310f85dc7 Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 2012-09-14 10:53:55 -07:00
Robert Greenwalt
f60b92bb41 Protect self from async change of BluetoothPan 
bug:6945678
Change-Id: I627a55aea9170f889823a38c8e2bb08a06faa841
 2012-09-14 10:40:20 -07:00
The Android Automerger
390b873f56 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 07:12:28 -07:00
Amith Yamasani
32dccbc23f Watch for profile changes and push to user manager 
If the contacts Me Profile changes, push a copy of the photo to
user manager for user by the user switcher.

Also use an async task to load the profile data.

Change-Id: Ie784114622038ff14e3feb70f2ff51c372eecb3f
 2012-09-13 23:32:35 -07:00
Dianne Hackborn
da71d70922 am 18914118: am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev 
* commit '18914118963b59705052049505b1862c367d3cf7':
  Multi-user battery settings.
 2012-09-13 14:12:11 -07:00
Jeff Sharkey
1a5b1f1e88 am 7786df05: am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 
* commit '7786df0508f1de403155a1518d99b509d59e763c':
  Iteration on multi-user Storage UI.
 2012-09-13 14:11:13 -07:00
Dianne Hackborn
a955d2f41c am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev 
* commit 'b6d7c9c6f93e3d50a3fc5ce2db900a10cbb258e4':
  Multi-user battery settings.
 2012-09-13 10:37:45 -07:00
Dianne Hackborn
1891411896 am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev 
* commit 'b6d7c9c6f93e3d50a3fc5ce2db900a10cbb258e4':
  Multi-user battery settings.
 2012-09-13 10:37:39 -07:00
Dianne Hackborn
b6d7c9c6f9 Merge "Multi-user battery settings." into jb-mr1-dev 2012-09-13 10:36:14 -07:00
The Android Automerger
f642a6a221 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-13 07:00:17 -07:00
Christopher Tate
6fa0dbb178 am cf50b245: am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev 
* commit 'cf50b2452191b043e86b513fa109e756c2c7e332':
  Don't crash during setup of secondary users
 2012-09-13 03:21:39 -07:00
Amith Yamasani
577ee8c0e7 am d9c5310b: am 43db5267: Tell contacts to return back to Settings when done editing the profile info 
* commit 'd9c5310bfccdd964fc4e34ca8b4204c0008db1ba':
  Tell contacts to return back to Settings when done editing the profile info
 2012-09-13 03:21:37 -07:00
Jeff Sharkey
85453fbde6 am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 
* commit '4a0953818da25e2240d32136821d4ecb97f90ce1':
  Iteration on multi-user Storage UI.
 2012-09-13 01:32:58 -07:00
Jeff Sharkey
7786df0508 am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 
* commit '4a0953818da25e2240d32136821d4ecb97f90ce1':
  Iteration on multi-user Storage UI.
 2012-09-13 01:32:54 -07:00
Jeff Sharkey
4a0953818d Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 2012-09-13 01:31:46 -07:00
Jeff Sharkey
da13ec0cb4 Iteration on multi-user Storage UI. 
Now that DefaultContainerService has visibility of external storage
for all users, we can measure internal storage in a single pass.
Internal storage measurement now iterates across all known users,
counting both apps and emulated storage usage.

Create MeasurementDetails object with documentation about what is
counted under various device configurations.  Generalize to measure
each Environment.DIRECTORY separately, so it can be combined as
needed.  General cleanup of how measurements are passed to UI.

Bug: 7003520
Change-Id: Ib89c185296a0c9debdc20beeaa98584d803a84e8
 2012-09-13 01:13:48 -07:00
Dianne Hackborn
52e56a2490 Multi-user battery settings. 
Aggregates battery use from other users into one line item.

Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
 2012-09-12 21:45:18 -07:00
Christopher Tate
17a1a0e216 am 5f55c55b: am 4a596b19: Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev 
* commit '5f55c55b3f419b2e848b44b372b5649d5873f2ff':
  Correct settings namespace for auto time/tz
 2012-09-12 17:03:24 -07:00
Fabrice Di Meglio
e5a3b60e37 am 3a84f707: am 01bd0f00: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit '3a84f70772df1d5c38a4fdd553add9a39ef2ddb6':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-09-12 17:02:54 -07:00
The Android Open Source Project
599dc1d88f am c737e92d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'c737e92d4573ae6809f86c812d563ab88fe95d8c':
  Wifi settings are in a different namespace now
  Update Settings app to use new namespace for airplane-mode settings
 2012-09-12 16:59:12 -07:00
Christopher Tate
cf50b24521 am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev 
* commit '2001a179cc0a0c42bd9fae21e51793c16f09d0ae':
  Don't crash during setup of secondary users
 2012-09-12 15:56:38 -07:00
Amith Yamasani
d9c5310bfc am 43db5267: Tell contacts to return back to Settings when done editing the profile info 
* commit '43db5267d6227cc008fc482ccd777e27ff292c42':
  Tell contacts to return back to Settings when done editing the profile info
 2012-09-12 15:56:37 -07:00
Christopher Tate
0f385e446b am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev 
* commit '2001a179cc0a0c42bd9fae21e51793c16f09d0ae':
  Don't crash during setup of secondary users
 2012-09-12 15:56:04 -07:00
Amith Yamasani
8c93fc41af am 43db5267: Tell contacts to return back to Settings when done editing the profile info 
* commit '43db5267d6227cc008fc482ccd777e27ff292c42':
  Tell contacts to return back to Settings when done editing the profile info
 2012-09-12 15:56:03 -07:00
Christopher Tate
2001a179cc Merge "Don't crash during setup of secondary users" into jb-mr1-dev 2012-09-12 15:54:29 -07:00