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
Amith Yamasani
52d8db7fb2 am 966c2d3f: am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings" 
* commit '966c2d3fc61a1fed5c5e587c6ef29b2b68d01372':
  No back icon in action bar of APN Settings
 2013-05-20 18:26:12 -07:00
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
Dmitry Shmidt
304070968a Merge "Disable On/OFF switch before action" 2013-05-21 01:18:08 +00: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
Dianne Hackborn
62ef26c2cd Merge "Add wake lock app ops to UI." 2013-05-21 00:54:19 +00:00
Amith Yamasani
c46a41cd5a am 738c373f: am f88e6e5a: Don\'t mutate all instances of app icons in Settings 
* commit '738c373f3a27f30d631881c1633cca343e512e8f':
  Don't mutate all instances of app icons in Settings
 2013-05-20 17:40:52 -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
Dmitry Shmidt
70c35ef071 Disable On/OFF switch before action 
Bug: 8715336

Change-Id: I3d4b05ae9dfe109af0b9b06340d52004b73ad0f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-05-20 17:39:24 -07:00
Dianne Hackborn
ec74da60cd Add wake lock app ops to UI. 
Change-Id: Id2f23acee08fa2830d3edc30a70abf06226ae4eb
 2013-05-20 16:45:26 -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
Baligh Uddin
405959f44a Merge "Import translations. DO NOT MERGE" 2013-05-20 19:59:33 +00:00
Eric Laurent
0c38f78040 Merge "Single volume control when config_useMasterVolume is true" 2013-05-20 19:13:46 +00:00
Baligh Uddin
6ebd40846a Import translations. DO NOT MERGE 
Change-Id: Ic02fef38ac538c74b0ae6fc5262ca2729b6b675d
Auto-generated-cl: translation import
 2013-05-20 11:38:20 -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
0c4d6ca03c am d82fa081: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'd82fa081f96985ceef99f523a83e2bb365b949b1':
 2013-05-20 08:26:23 -07: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
7e8455bc09 am 5675f50c: am b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev 
* commit '5675f50cede90921c4a73cd94d191e39820a24d5':
  Load the avatar icon if it's not yet in the activity view
 2013-05-17 17:41:31 -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
75713a426f am 8ea4fe7a: (-s ours) am 27d5c392: Import translations. DO NOT MERGE 
* commit '8ea4fe7ae5ecb320ac065ee8dc3b8e8e40612a42':
  Import translations. DO NOT MERGE
 2013-05-17 15:41:58 -07: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
Baligh Uddin
c3ff376aa2 Merge "Import translations. DO NOT MERGE" 2013-05-17 22:37:14 +00: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
7e27ede47f am 958c30d4: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '958c30d422801c25b0b67534a5e2083941bad9a8':
 2013-05-17 12:56:09 -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
d4d7f3ee62 Import translations. DO NOT MERGE 
Change-Id: I1c9b7f0dca3797c176d4f7ce82e1744d6795e0b8
Auto-generated-cl: translation import
 2013-05-17 12:20:17 -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
Jaewan Kim
31a0a340b3 Single volume control when config_useMasterVolume is true 
If config_useMasterVolume is true, all streams are considered as the
STREAM_MASTER. Hide all volume sections except a stream because they
are actually the same in this case.

Bug: 8505295
Change-Id: I9822feaad2d43468ceb4c7fdb97da4b677995992
 2013-05-17 02:43:12 +09:00
John Spurlock
b555cebe63 am cea06adc: am 31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev 
* commit 'cea06adce077d32c0c6dc2abb68cbae8bd1a82a7':
  Hide notification listeners setting if no listeners.
 2013-05-16 08:40:05 -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
5c8acc3903 am d668d744: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'd668d74408d7c6c71dfbc04e12da7ce1ff9e2af1':
 2013-05-16 05:48:19 -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
4ebe028d53 am 010ab3bd: am e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev 
* commit '010ab3bd92f17b634e962f4a4ea20f1bcc3490e6':
  Return proper result code after creating pin/password lock
 2013-05-15 17:14:07 -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
7545cff217 am 813d2383: am 00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev 
* commit '813d23838b76623faa6b2ceb4ad7458cba0f726f':
  Add a settings icon to restricted profile config header
 2013-05-14 14:58:12 -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
7f7a07d365 Merge "Use circular avatars wherever appropriate" 2013-05-13 23:07:00 +00:00
Amith Yamasani
b0b0b110c0 Use circular avatars wherever appropriate 
Battery stats, Data usage and Running apps

Change-Id: Ib7f851e55ef7e44f18d3f8a2cd27f5f2204b0145
 2013-05-13 16:01:20 -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
39da2f9129 am b2dccc41: am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev 
* commit 'b2dccc418410cd2c35213fddb5da7dce1d91c47b':
  Remove wifi scan-always dialog.
 2013-05-13 14:15:41 -07:00