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

10519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
966c2d3fc6 am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings" 
* commit 'b514a95ce7009a61532f00d4ac5ab73861d2b327':
  No back icon in action bar of APN Settings
 2013-05-20 18:24:23 -07:00
Amith Yamasani
b514a95ce7 am 4abe488a: Merge "No back icon in action bar of APN Settings" 
* commit '4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
  No back icon in action bar of APN Settings
 2013-05-20 18:16:42 -07:00
Amith Yamasani
738c373f3a am f88e6e5a: Don\'t mutate all instances of app icons in Settings 
* commit 'f88e6e5ae6a5a31d47677dcbd9be2b26c6615136':
  Don't mutate all instances of app icons in Settings
 2013-05-20 17:39:29 -07:00
Amith Yamasani
f88e6e5ae6 Don't mutate all instances of app icons in Settings 
When adding color filters to an app icon in User Settings, don't
modify the original drawable state. Get a mutable drawable.

Bug: 9054675
Change-Id: I6ea374cb801abef3f5b597fda2e84b4e67cfa9d0
 2013-05-20 16:05:22 -07:00
Amith Yamasani
4abe488a5f Merge "No back icon in action bar of APN Settings" 2013-05-20 18:07:21 +00:00
The Android Open Source Project
d82fa081f9 Reconcile with jb-mr2-release - do not merge 
Change-Id: I82e5359280f8eeb68b9ef61dc4acb3804d8f9106
 2013-05-20 08:20:38 -07:00
smitha.x.smitha
0a20f2e5a2 No back icon in action bar of APN Settings 
When entering the APN menu, the actionbar is missing a back
icon allowing the user to go back to the previous pane.

Added parentActivityName in ApnSettings, to enable action
bar back icon.

Change-Id: Iee8bb420f47c0e2c0d9a43739f534466abba30db
 2013-05-20 09:55:09 +02:00
The Android Automerger
4bca1a2081 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-19 05:55:41 -07:00
Amith Yamasani
5675f50ced am b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev 
* commit 'b96ebf9eed3df26e523055fde98913507e6b1a8a':
  Load the avatar icon if it's not yet in the activity view
 2013-05-17 17:39:19 -07:00
Amith Yamasani
b96ebf9eed Merge "Load the avatar icon if it's not yet in the activity view" into jb-mr2-dev 2013-05-18 00:37:15 +00:00
Baligh Uddin
8ea4fe7ae5 am 27d5c392: Import translations. DO NOT MERGE 
* commit '27d5c392ba6ce9f9ab4bbc71b2cdfea15c0140f2':
  Import translations. DO NOT MERGE
 2013-05-17 15:39:53 -07:00
Amith Yamasani
76738fa651 Load the avatar icon if it's not yet in the activity view 
Save any changes that weren't committed yet, but don't restore
earlier cancelled changes.

Bug: 9008014
Change-Id: I8faacc42a3600d1338ddedb1b59f7307903743b4
 2013-05-17 15:09:47 -07:00
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