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

10556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
958c30d422 Reconcile with jb-mr2-release - do not merge 
Change-Id: Id11469f5fc48fc2af186000e2eb8ade5fb5264ab
 2013-05-17 12:54:50 -07:00
Baligh Uddin
27d5c392ba Import translations. DO NOT MERGE 
Change-Id: Idaa8cda2a62a48bfaf80cd2a3c848ab99179dcda
Auto-generated-cl: translation import
 2013-05-17 12:17:02 -07:00
John Spurlock
cea06adce0 am 31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev 
* commit '31ce86d3bd69a2c7e7bdfec3cf9317d53f7ec1df':
  Hide notification listeners setting if no listeners.
 2013-05-16 08:38:25 -07:00
John Spurlock
31ce86d3bd Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev 2013-05-16 15:36:27 +00:00
The Android Automerger
2dc6fbf2ac merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-16 05:55:44 -07:00
The Android Open Source Project
d668d74408 Reconcile with jb-mr2-release - do not merge 
Change-Id: Iae037f50e82720a2eb374281a91bb9638b8f7985
 2013-05-16 05:44:09 -07:00
Amith Yamasani
010ab3bd92 am e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev 
* commit 'e5fc407146c3f09e3bcd55d907fdffe2d26f3c6d':
  Return proper result code after creating pin/password lock
 2013-05-15 17:12:02 -07:00
Amith Yamasani
e5fc407146 Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev 2013-05-16 00:01:42 +00:00
Amith Yamasani
8d26ba45e3 Return proper result code after creating pin/password lock 
When adding a new restricted profile, user must enter some lockscreen
security. For PIN/password, return the result code (instead of cancelled)
so that UserSettings can proceed with adding the profile.

Bug: 8909229
Change-Id: I3567d7dfac869e38762f9e2a45d8ec83c51fa657
 2013-05-15 11:26:19 -07:00
John Spurlock
55dbdf68f9 Hide notification listeners setting if no listeners. 
Hide the new notification listeners management setting when
no listeners using this API are available.

Bug: 8454150
Change-Id: Iae9f975e7b5a3cdf55ff7d0c6aea7e84166d53b3
 2013-05-15 10:13:34 -04:00
The Android Automerger
8ef742c228 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-15 05:55:42 -07:00
Amith Yamasani
813d23838b am 00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev 
* commit '00dc15d9dab780e9a61d1b3a20446d6519b5b076':
  Add a settings icon to restricted profile config header
 2013-05-14 14:56:13 -07:00
Amith Yamasani
00dc15d9da Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev 2013-05-14 21:54:28 +00:00
The Android Automerger
20010a7286 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-14 05:55:44 -07:00
Amith Yamasani
1d4329631d Add a settings icon to restricted profile config header 
This is to make it obvious that the header invokes user info settings.

Bug: 8888002

Also fix a minor copy/paste error in contentDesription attribute.

Change-Id: I3a90b0d691df8302fee696d82c5819f43109ae8e
 2013-05-13 14:58:56 -07:00
Robert Greenwalt
b2dccc4184 am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev 
* commit 'd5d61a0ab18c57cf2087d17f10d4d4569d968078':
  Remove wifi scan-always dialog.
 2013-05-13 14:13:48 -07:00
Robert Greenwalt
d5d61a0ab1 Merge "Remove wifi scan-always dialog." into jb-mr2-dev 2013-05-13 21:11:20 +00:00
Robert Greenwalt
7e59f73e9c Remove wifi scan-always dialog. 
When wifi is switched off we no longer want a notification dialog
about scan-always, instead using in-panel text.

bug:8907190
Change-Id: I707f306a056068d92f69070873f1e6330b598b1e
 2013-05-13 11:39:08 -07:00
Baligh Uddin
9df440f7ed am 0a3cf293: Import translations. DO NOT MERGE 
* commit '0a3cf29344bcfd7071975c9f266574454209aa95':
  Import translations. DO NOT MERGE
 2013-05-13 09:50:06 -07:00
Baligh Uddin
0a3cf29344 Import translations. DO NOT MERGE 
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
 2013-05-13 09:42:52 -07:00
The Android Automerger
527900a63a merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-09 05:55:41 -07:00
Svetoslav
6b8c7e7c33 am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev 
* commit '7e554395cbf3d3c1043e99fb080bd9148832c225':
  Settings crashing if there are no installed accessibility services.
 2013-05-08 14:37:00 -07:00
Svetoslav
7e554395cb Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev 2013-05-08 21:33:14 +00:00
Svetoslav
084fbc8107 Settings crashing if there are no installed accessibility services. 
If there is no installed accessibility services and the user goes into
the accessibility settings section, the app crashes. This is due to a
lacking null pointer check against the list of installed services
returned by the accessibility manager. We should not have returned
null, rather an empty list - too late now, sigh...

bug:8871034

Change-Id: Id3800d398af83868862847fa7ed861a9dee61c8f
 2013-05-08 12:14:18 -07:00
Baligh Uddin
eb8e9c11ed am 2c766ba5: Import translations. DO NOT MERGE 
* commit '2c766ba56c740ec09f071144014272f4d922d518':
  Import translations. DO NOT MERGE
 2013-05-08 11:28:49 -07:00
Baligh Uddin
2c766ba56c Import translations. DO NOT MERGE 
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
 2013-05-08 11:03:17 -07:00
The Android Automerger
1ea87b0313 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-07 05:55:42 -07:00
Baligh Uddin
7f4c7641e0 am c6adece0: Import translations. DO NOT MERGE 
* commit 'c6adece066c2bc282db92547913a8aa43831c5f0':
  Import translations. DO NOT MERGE
 2013-05-06 12:31:30 -07:00
Baligh Uddin
c6adece066 Import translations. DO NOT MERGE 
Change-Id: Ib1986e8c494733193e49c1504a4cc9396649a324
Auto-generated-cl: translation import
 2013-05-06 11:59:20 -07:00
Baligh Uddin
c8e75eaaab am 6681e954: Import translations. DO NOT MERGE 
* commit '6681e954a8d05d818b9bd89a1302ac2d8875ab77':
  Import translations. DO NOT MERGE
 2013-05-06 11:11:29 -07:00
The Android Automerger
d6377770ba merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-06 05:55:52 -07:00
Baligh Uddin
6681e954a8 Import translations. DO NOT MERGE 
Change-Id: I6905b70a4bfdbab57f787be455fead0a995904a2
Auto-generated-cl: translation import
 2013-05-03 13:12:52 -07:00
The Android Automerger
e624f14e9d merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-02 05:55:40 -07:00
Baligh Uddin
e9160a2431 am 6c886cd3: Import translations. DO NOT MERGE 
* commit '6c886cd394e0960a1ed41a785e05b38a57ee8209':
  Import translations. DO NOT MERGE
 2013-05-01 13:48:35 -07:00
Baligh Uddin
6c886cd394 Import translations. DO NOT MERGE 
Change-Id: I09ddb61e89b8dfee57a2a4e6c3331a0737f1f290
Auto-generated-cl: translation import
 2013-05-01 10:43:33 -07:00
The Android Automerger
0c07cf3dc8 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-01 05:56:00 -07:00
Jake Hamby
0c3cc87858 am 18c4317b: Show correct A2DP connection status in Bluetooth settings. 
* commit '18c4317b93fce47109017efdab089dec4b01f790':
  Show correct A2DP connection status in Bluetooth settings.
 2013-04-30 17:04:59 -07:00
Baligh Uddin
af05f177f2 am e3eb601d: Import translations. DO NOT MERGE 
* commit 'e3eb601dc232ba9a14396ec26368e0a0f14084c7':
  Import translations. DO NOT MERGE
 2013-04-30 16:42:39 -07:00
Jake Hamby
18c4317b93 Show correct A2DP connection status in Bluetooth settings. 
When BluetoothSettings is entered via QuickSettings while an A2DP
device is connected, we aren't showing the device connection
status in the UI, because the device list is created before we've
connected to the A2DP and Headset profile services, and we weren't
refreshing the device list UI after getting the callback for
onServiceConnected() and retrieving the list of connected devices.

Add a line to HeadsetServiceListener.onServiceConnected() to call
device.refresh() after we call device.onProfileStateChanged() to
refresh the device list UI. Also copy the logic into A2dpProfile's
onServiceConnected() callback so it will refresh the UI for any
connected A2DP devices.

The reason this bug doesn't show up when entering BT settings
from the main Settings screen is because the onServiceConnected()
callbacks happen before the device list is initialized, so the
UI items are created with the correct connection status. For the
same reason, the bug doesn't occur if the Settings app is already
running and we re-enter it via Bluetooth QuickSettings.

Bug: 8724247
Change-Id: I1a993636ecab18dd6e980e3b4d2485bbed256d74
 2013-04-30 13:51:38 -07:00
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
e3eb601dc2 Import translations. DO NOT MERGE 
Change-Id: I81f4941adbfc66c70b241062ae75b4740a065a08
Auto-generated-cl: translation import
 2013-04-30 00:42:26 -07: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
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