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

10458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
c1e3983b31 Merge "Fix NullPointerException at RunningState" 2013-04-16 13:16:17 +00:00
Amith Yamasani
91b5fab9b0 Merge "Check if the Activity is finishing before showDialog()" 2013-04-16 13:13:53 +00:00
The Android Automerger
7adddb8df2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-16 05:55:44 -07:00
Jim Miller
99b50ae584 Move owner info from Settings.Secure to LockSettings 
Fixes bug 8512972

Change-Id: I3eb68ace44c51daa012547908e28544a2d94847d
 2013-04-15 20:27:55 -07:00
Kenny Root
d56e4ad773 am 1a72d9c4: Merge "Remove old KeyStore API call sites" into jb-mr2-dev 
* commit '1a72d9c49b11355135af6807d316e473d7d2423e':
  Remove old KeyStore API call sites
 2013-04-15 13:49:51 -07:00
Kenny Root
1a72d9c49b Merge "Remove old KeyStore API call sites" into jb-mr2-dev 2013-04-15 20:45:17 +00:00
Baligh Uddin
a9e23a52e1 am cc41daba: Import translations. DO NOT MERGE 
* commit 'cc41daba492503c6ea6ffad27691197f7165dce1':
  Import translations. DO NOT MERGE
 2013-04-15 13:00:55 -07:00
Baligh Uddin
cc41daba49 Import translations. DO NOT MERGE 
Change-Id: Ia5a4c8320ec06c7aee2eeb272fc62939a7b63cce
Auto-generated-cl: translation import
 2013-04-15 11:12:49 -07:00
The Android Open Source Project
a53807ddd8 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ie31f29c0b7587e4567140530b6f8bd199b0e5a79
 2013-04-15 10:46:27 -07:00
The Android Automerger
375a27daa6 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:56:22 -07:00
Amith Yamasani
9217185d74 am c39dcc1c: Don\'t show developer options to secondary users 
* commit 'c39dcc1ce4d1885ef1de926b67e88cf2dd1acaff':
  Don't show developer options to secondary users
 2013-04-13 18:48:49 -07:00
Amith Yamasani
c39dcc1ce4 Don't show developer options to secondary users 
Show just a message that developer options are not available for the user.

Also fix silent exit of AddAccount operation by showing a toast that user
cannot add accounts.

Bug: 7409523
Bug: 8519646
Bug: 7304007

Change-Id: Id3f430d568d6b7151ac55f86dbc0ef91803fa10c
 2013-04-13 18:43:41 -07:00
Amith Yamasani
c36b39696c am 34a62601: Merge "Disable apps that require an account on a limited user" into jb-mr2-dev 
* commit '34a62601adf20482d88c153b13d51074a9f3ae5a':
  Disable apps that require an account on a limited user
 2013-04-13 15:56:28 -07:00
Amith Yamasani
34a62601ad Merge "Disable apps that require an account on a limited user" into jb-mr2-dev 2013-04-13 22:54:18 +00:00
Amith Yamasani
9517b02d43 Disable apps that require an account on a limited user 
If an app is marked as requiring an account to work, disable that app
and show a message in the summary.

Also, implement graying out of icons for deselected apps.

Bug: 8600261
Change-Id: I9cf48832675c24257e09addad4316249082c30fb
 2013-04-12 17:56:34 -07:00
Kenny Root
14415168b1 Remove old KeyStore API call sites 
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: I59e38efbab6ad60a905ce8678a340da2088b19c9
 2013-04-12 17:35:55 -07:00
Baligh Uddin
6b634ceb56 am 8054254a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '8054254a8aa73e8aefe019149c9ce37702496ee8':
  Import translations. DO NOT MERGE
 2013-04-12 16:11:34 -07:00
Baligh Uddin
8054254a8a Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-12 23:06:31 +00:00
Maggie Benthall
5cc298c838 am 8c32c28f: Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev 
* commit '8c32c28f1909393bd01a34fb966b23caba9e69da':
  Implement Settings app UX for when a user has wifi config locked down.
 2013-04-12 14:34:52 -07:00
Maggie Benthall
8c32c28f19 Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev 2013-04-12 21:28:19 +00:00
Emily Bernier
0e34529c2a am 91d40b7d: Merge "User restrictions for creds storage & user removal" into jb-mr2-dev 
* commit '91d40b7d972a0b5b8591c36f74f8aad38d82c796':
  User restrictions for creds storage & user removal
 2013-04-12 13:25:55 -07:00
Emily Bernier
91d40b7d97 Merge "User restrictions for creds storage & user removal" into jb-mr2-dev 2013-04-12 20:22:04 +00:00
Amith Yamasani
a01f625f50 am 35f02378: Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev 
* commit '35f02378710a0fd33bf62d2d10e0c655fe07d519':
  Embed the app restrictions fragment in the dual-pane settings.
 2013-04-12 11:02:23 -07:00
Amith Yamasani
35f0237871 Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev 2013-04-12 17:58:03 +00:00
Baligh Uddin
da9fa0a599 Import translations. DO NOT MERGE 
Change-Id: I55d1e2ad4c165c7098054dadaa79ea3e6896fc89
Auto-generated-cl: translation import
 2013-04-12 10:56:21 -07:00
Irfan Sheriff
2cc2b0f2cb am a2e64ac8: Merge "Limit device name length" into jb-mr2-dev 
* commit 'a2e64ac8151bafc1f89a6aaa0fa53f049fba21ba':
  Limit device name length
 2013-04-12 09:59:41 -07:00
Irfan Sheriff
a2e64ac815 Merge "Limit device name length" into jb-mr2-dev 2013-04-12 16:55:13 +00:00
Irfan Sheriff
540f75aa92 Limit device name length 
Bug: 8599677
Change-Id: Ifce5579c0a65c98a4faaad286a7255b2e63d2a76
 2013-04-11 22:26:28 -07:00
Amith Yamasani
cc395695fc Embed the app restrictions fragment in the dual-pane settings. 
Change the limited user creation flow to show the usual message before
actually adding the user. Might need to customize the message for limited
users.

Removed the old activity wrapper and moved the logic to UserSettings.

Removed the finish button.

Bug: 8566751
Change-Id: Ie9e1a03736c41758b0bb6e79d004ad662a5af7f4
 2013-04-11 18:21:07 -07:00
Emily Bernier
11bd33a564 User restrictions for creds storage & user removal 
Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20
 2013-04-11 19:54:57 -04:00
Benjamin Poiesz
2bd6591025 am b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev 
* commit 'b0746763ba79f2f002cf68d180bac6ab33e49f8d':
  Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
 2013-04-11 15:15:18 -07:00
Benjamin Poiesz
b0746763ba Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev 2013-04-11 22:12:10 +00:00
Amith Yamasani
c077cd8dec am d8b0d0ed: Make sure Settings app restrictions show up 
* commit 'd8b0d0ed8e12c1c3f5c44d50ddf3a69aa8a2be72':
  Make sure Settings app restrictions show up
 2013-04-11 13:52:50 -07:00
Benjamin Poiesz
cbde502ebb Forcing the settings apk to be built with the zz_ZZ pseudolocale. 
This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.

Bug #8556677

Change-Id: I68ffc81454865dec94a3c1460019d1efce00ea49
 2013-04-11 13:32:39 -07:00
Maggie Benthall
7e61c23306 Implement Settings app UX for when a user has wifi config locked down. 
When the user is restricted from configuring wifi:
- Leave the on/off button enabled
- Hide all menu options
- Hide all networks, and display a message saying:
 "This user is not allowed to configure wireless networks."

Change-Id: I20193b552ea071740686bd9091637459e9b668b5
 2013-04-11 15:45:58 -04:00
Amith Yamasani
d8b0d0ed8e Make sure Settings app restrictions show up 
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.

Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
 2013-04-11 11:12:35 -07:00
The Android Open Source Project
d8a4eed488 Reconcile with jb-mr2-release - do not merge 
Change-Id: I18995b65eb42855a0e4559731b1c180ab12f34f5
 2013-04-11 07:45:28 -07:00
Maggie Benthall
2def3df600 am 3c3fa0cc: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev 
* commit '3c3fa0ccb8bf9f62558202e909cc158a2e673e37':
  Implement Settings app UX for when a user has bluetooth config locked down.
 2013-04-11 07:08:37 -07:00
Maggie Benthall
3c3fa0ccb8 Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev 2013-04-11 14:04:40 +00:00
The Android Automerger
e41164e928 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-11 05:55:58 -07:00
Amith Yamasani
7805d74cd7 am d81a3f73: Improve app list for limited users 
* commit 'd81a3f73680372ba93a2a26a445d148220c1a521':
  Improve app list for limited users
 2013-04-10 22:13:09 -07:00
Amith Yamasani
d81a3f7368 Improve app list for limited users 
Show all activities in the same package with a master/slave relationship,
toggling all when the master is toggled.
Don't show required apps that have no restrictions.
Show apps that are only installed on the target user.

Bug: 8520813 lowercase app names
Bug: 8520185 apps installed only in limited user
Bug: 8567000 strange behavior with apps that have two launcher icons
Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
 2013-04-10 21:59:18 -07:00
Svetoslav
fce2148f3c am 96cd9e7c: First accessibility device disabled if enableing a second one is canceled. 
* commit '96cd9e7cc7d830756f42aa715e0062f938d4ae55':
  First accessibility device disabled if enableing a second one is canceled.
 2013-04-10 17:56:25 -07:00
Svetoslav
96cd9e7cc7 First accessibility device disabled if enableing a second one is canceled. 
The value whether accessibility should stay enabled was incorrectly
computed and as a result accessibility was disaabled when the second
accessibility service enabling is canceled.

bug:7716830

Change-Id: Ic23c24b1ffa90811e21210aeeca158568ad37904
 2013-04-10 17:33:42 -07:00
Dianne Hackborn
5d46a54c55 am 8c94273c: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 
* commit '8c94273c73480c35ee0af8910b32f0d4dec48132':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
 2013-04-10 14:16:34 -07:00
Dianne Hackborn
8c94273c73 Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 2013-04-10 21:14:22 +00:00
Baligh Uddin
8059d27e73 am fdc5489b: Import translations. DO NOT MERGE 
* commit 'fdc5489b56a0432b1b05fd2cc36d8b729d9fabf5':
  Import translations. DO NOT MERGE
 2013-04-10 13:00:33 -07:00
Dianne Hackborn
1d675e6546 Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats 
Should be comparing with Bluetooth UID, not the wrong and broken GID.

Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
 2013-04-10 12:50:32 -07:00
Baligh Uddin
fdc5489b56 Import translations. DO NOT MERGE 
Change-Id: Ifb727fcd1cfd28e78a2f405ee5cbba21e1999ab3
Auto-generated-cl: translation import
 2013-04-10 11:27:46 -07:00
The Android Open Source Project
122bfe4f04 Reconcile with jb-mr2-release - do not merge 
Change-Id: I5597c4b46c146b190370d63e0128d2d84f80888a
 2013-04-10 10:06:01 -07:00