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
The Android Automerger
62fcd8d4d8 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-30 05:56:17 -07:00
Baligh Uddin
edb906af36 Import translations. DO NOT MERGE 
Change-Id: I76329240b2241ff7c949f725efa875425569bc16
Auto-generated-cl: translation import
 2013-04-30 00:45:30 -07:00
Baligh Uddin
e3eb601dc2 Import translations. DO NOT MERGE 
Change-Id: I81f4941adbfc66c70b241062ae75b4740a065a08
Auto-generated-cl: translation import
 2013-04-30 00:42:26 -07:00
Satoshi Kataoka
5df3307309 Fix the title of the fragments of the personal dictionary settings 
Bug: 8600958
Change-Id: I9b8bab21b144385bc2386e7fcb67e1c197f84113
 2013-04-30 16:08:00 +09:00
Kenny Root
6491436480 resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp 
Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829
 2013-04-29 23:30:40 -07:00
Kenny Root
3c10f53578 Merge "Track change to JSSE provider" 2013-04-30 04:01:45 +00:00
Irfan Sheriff
3b22f4d2da am 3caffdb3: Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev 
* commit '3caffdb343ba0bcb71396c6077355b0606d2f9eb':
  Add reminder about scan settings on wifi off
 2013-04-29 16:01:56 -07:00
Irfan Sheriff
3caffdb343 Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev 2013-04-29 22:59:00 +00:00
Amith Yamasani
6016726687 am f162efee: Prompt to set a screen lock when adding a restricted profile 
* commit 'f162efee8995c8d7a26992e72fe771c41b790e39':
  Prompt to set a screen lock when adding a restricted profile
 2013-04-29 14:15:57 -07:00
Amith Yamasani
f162efee89 Prompt to set a screen lock when adding a restricted profile 
Bug: 8735493

If there's no screen lock, prompt to take the user to set a lock.
On return, check if user set the screen lock. If so, add the restricted
profile, otherwise don't add it.

Fix a small layout issue: Bug: 8721209

Change-Id: I2a18fea50a1d810d6a7fa82038b460ca4e03d5a0
 2013-04-29 14:10:06 -07:00
Amith Yamasani
5c460bbafe am b4a0838d: am b0171715: Three kinds of owner info - owner, user and profile 
* commit 'b4a0838d08198fd93be99ce2907b3f9b70f0d7bc':
  Three kinds of owner info - owner, user and profile
 2013-04-29 12:14:41 -07:00
Amith Yamasani
52351051e6 am 9649c3eb: am c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev 
* commit '9649c3ebbe08e310bdc42dbfce48b64d7246a202':
  Save app toggle state as soon as possible
 2013-04-29 12:14:37 -07:00
Kenny Root
ecee18e569 am d7d5f4d1: am c814271f: Merge "Fix Clear Credentials item" 
* commit 'd7d5f4d1bfedda52c2686a08a62dec1fa02dba58':
  Fix Clear Credentials item
 2013-04-29 12:14:37 -07:00
Svetoslav
5334dbf090 am 7c2a89c9: am 4b43e21c: Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev 
* commit '7c2a89c9f5f4c728b552a6ea64b312c2538854e4':
  Scroll if an accessibility setting description does not fit the screen.
 2013-04-29 11:22:03 -07:00
Baligh Uddin
a2a3ccf7a8 am 584a9026: am 837526fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '584a90263223243c2af1e7991740515e22950143':
  Import translations. DO NOT MERGE
 2013-04-29 11:21:57 -07:00
Kenny Root
d76bc2248e Track change to JSSE provider 
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
 2013-04-29 10:43:00 -07:00
Irfan Sheriff
c591a8b95d Add reminder about scan settings on wifi off 
Notify the user that scans will be available when
wifi is turned off

Bug: 8732391
Change-Id: If232bfb9f6c3976059bde11280318901c35161e7
 2013-04-29 09:42:22 -07:00
The Android Automerger
9fe2969624 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-29 05:56:10 -07:00
Amith Yamasani
b4a0838d08 am b0171715: Three kinds of owner info - owner, user and profile 
* commit 'b0171715876b672c94c8a5aaafde95ff47b234b4':
  Three kinds of owner info - owner, user and profile
 2013-04-28 22:23:20 -07:00
Amith Yamasani
b017171587 Three kinds of owner info - owner, user and profile 
Bug: 8736733

Put the summary "Restricted profile" under the user name in app restrictions panel.
Bug: 8736734

Change-Id: I6b724bd10a9246eb57831bffb737a48c01e0c285
 2013-04-28 22:13:22 -07:00
Jaewan Kim
acb7583922 Remove Accessibility shortcut if the shortcut is not available 
Bug: 8051556
Change-Id: Ic6b552e818a1bd2fea6fdae2e755f31420abfbe6
 2013-04-28 12:09:25 +00:00
Jaewan Kim
2e41e3db43 Remove Airplane Mode setting if it's a stationary device 
Bug: 8051556
Change-Id: I3a1d5d58573b8967ce40ccf8b76e24152fff6fb6
 2013-04-28 12:09:25 +00:00
Amith Yamasani
9649c3ebbe am c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev 
* commit 'c5b036571ed2eeae73b0551848e7f7efdc016a52':
  Save app toggle state as soon as possible
 2013-04-27 22:01:09 -07:00
Amith Yamasani
c5b036571e Merge "Save app toggle state as soon as possible" into jb-mr2-dev 2013-04-28 04:58:54 +00:00
Kenny Root
d7d5f4d1bf am c814271f: Merge "Fix Clear Credentials item" 
* commit 'c814271fe4117a6c94a314a349edd8d7222cf2c0':
  Fix Clear Credentials item
 2013-04-27 15:01:04 -07:00
Kenny Root
c814271fe4 Merge "Fix Clear Credentials item" 2013-04-27 21:39:31 +00:00
Kenny Root
8eb42bd2e0 Fix Clear Credentials item 
This should be enabled whenever there is a credential in the keystore
since there can be unencrypted credentials in there now.

(cherry picked from commit c4372c3e3f)

Bug: 8651830
Change-Id: Ie06f20cf90f5a359975cb30d67052f8867b429b9
 2013-04-27 09:05:43 -07:00
Amith Yamasani
7b56d115ba Save app toggle state as soon as possible 
Delaying applying the states till onPause() sometimes results in the apps
disappearing slowly as the new user is booting up, causing failed queued up
broadcasts that result in crash dialogs. This happens mainly when the user
switch is initiated via QuickSettings->LockScreen->Switch while the App
restrictions screen is still showing. The onPause() gets called when
SetupWizard actually takes focus, which is quite late, as boot completed
and other events have already been queued.

Apply the initial toggles right away and apply any user changes when primary
is going to background, or onPause(), whichever comes first.

Bug: 8685927

Also ensure that apps with restrictions get a chance to persist their defaults
as soon as they are toggled on. The user may never actually click on the settings
icon for the app (which was the only way they were getting persisted before).

Some new strings for an upcoming change.

Change-Id: I96f453d066a91c6b15eafe9a6ce3f42d98bf5e33
 2013-04-26 15:18:33 -07:00
Svetoslav
7c2a89c9f5 am 4b43e21c: Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev 
* commit '4b43e21c647864c8105394f353d4533777e7f9c7':
  Scroll if an accessibility setting description does not fit the screen.
 2013-04-26 15:16:50 -07:00
Svetoslav
4b43e21c64 Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev 2013-04-26 22:14:47 +00:00
Baligh Uddin
584a902632 am 837526fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '837526fceaa39f88ac468406108faacd557f2d28':
  Import translations. DO NOT MERGE
 2013-04-26 14:53:26 -07:00
Baligh Uddin
8429e55492 Merge "Import translations. DO NOT MERGE" 2013-04-26 21:50:56 +00:00
Baligh Uddin
837526fcea Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-26 21:50:35 +00:00
Svetoslav
3b2d307b89 Scroll if an accessibility setting description does not fit the screen. 
1. Certain accessibility settings are shown on a separate screen with
   a toggle switch and a description. Sometimes the description does not
   fit the screen. The preference framework is using a list view for
   holding the description item. This list view was disabled, thus not
   scrolling (done to avoid drawable state change on click). Now the
   list view is enabled and the drawable state change on click problem
   is solved by setting the selector and divider drawables to a
   transparent one.

2. The layout for the list item that shows the feature description had
   an unnecessary linear layout.

bug:8632146

Change-Id: Ib81a8513158d5b8d90fa80f57720c8590022ae1a
 2013-04-26 12:36:00 -07:00
Baligh Uddin
2053307bc8 Import translations. DO NOT MERGE 
Change-Id: I4e1ef0256b87fef9461cd8750f9a5446eba9e91b
Auto-generated-cl: translation import
 2013-04-26 10:55:51 -07:00
Baligh Uddin
a69b41bb18 Import translations. DO NOT MERGE 
Change-Id: I902e886b71e60da9c34d682a8b7c4f2453c06375
Auto-generated-cl: translation import
 2013-04-26 10:52:46 -07:00
Amith Yamasani
4c8d57aca5 am 4424d159: am a7a93784: Always include default system IMEs for restricted profiles 
* commit '4424d1594968909c1c261bbd06094677906bbfb2':
  Always include default system IMEs for restricted profiles
 2013-04-26 10:50:10 -07:00
Amith Yamasani
4424d15949 am a7a93784: Always include default system IMEs for restricted profiles 
* commit 'a7a93784d1f9798d37cb618def1a558f8d626f0f':
  Always include default system IMEs for restricted profiles
 2013-04-26 10:47:18 -07:00
Amith Yamasani
a7a93784d1 Always include default system IMEs for restricted profiles 
Add default IMEs to an exclusion set so that we don't include them in the
list of toggleable system apps that we show the user.

Bug: 8724246

Unrevert the change to include disabled apps, as the above change fixes the
reason for the revert.

Bug: 8713202

Change-Id: Ifced841ad3bfbde33d2403356216dd1749b7fa9a
 2013-04-25 23:02:50 -07:00
Amith Yamasani
bae7b2b73f am c3e973c5: am 0cb93523: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev 
* commit 'c3e973c5da358489f6b7042d5be982e4e7ea6d00':
  Revert "Disabled apps should also be shown in restricted profiles app list"
 2013-04-25 17:14:40 -07:00
Daniel Sandler
a950712b87 am 1344ec19: am 77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev 
* commit '1344ec191894e88c998ff091c2afc16e870c46bc':
  Follow API changes to NotificationListener.
 2013-04-25 17:14:40 -07:00
Svetoslav
424119ae4e am 259668d8: am 410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev 
* commit '259668d82ffb66c35a97ea5fff8acf39d948019d':
  CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
 2013-04-25 17:14:39 -07:00
Amith Yamasani
c3e973c5da am 0cb93523: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev 
* commit '0cb93523b261c8779119ffa1cd7a45cf2d6b3814':
  Revert "Disabled apps should also be shown in restricted profiles app list"
 2013-04-25 16:58:03 -07:00
Daniel Sandler
1344ec1918 am 77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev 
* commit '77f71cb226203bf3f87eec749296feb3ecd18f43':
  Follow API changes to NotificationListener.
 2013-04-25 16:58:02 -07:00
Svetoslav
259668d82f am 410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev 
* commit '410e2df458328d5375b35ef9a610da240293d06b':
  CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
 2013-04-25 16:58:01 -07:00
Amith Yamasani
0cb93523b2 Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev 2013-04-25 22:22:25 +00:00
Amith Yamasani
39d0fd84ad Revert "Disabled apps should also be shown in restricted profiles app list" 
This is breaking restricted profiles because the Google Keyboard suddenly
shows up in the list as disabled and InputMethodManagerService crashes
if the only available keyboard is not installed for the profile.

This reverts commit 90dcd7469b

Change-Id: Idd7c4f0f93a973b777889865e80c53caad759a63
 2013-04-25 21:39:23 +00:00
Daniel Sandler
77f71cb226 Merge "Follow API changes to NotificationListener." into jb-mr2-dev 2013-04-25 21:04:02 +00:00
Daniel Sandler
fbfddb0d67 Follow API changes to NotificationListener. 
Requires change If3062b9f in f/b

Bug: 8656860
Change-Id: Ib3dc57489b7308f0515a2a19c5c6451607ff1796
 2013-04-25 17:01:37 -04:00
Baligh Uddin
dbb504294b am 740afcb6: am f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '740afcb64bb967bb4eada7f7bb071706378d818a':
  Import translations. DO NOT MERGE
 2013-04-25 13:50:33 -07:00