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
Baligh Uddin
ac61782431 am 804b8b60: Import translations. DO NOT MERGE 
* commit '804b8b60e7784ebbf660cf4348de24c1b2ae7146':
  Import translations. DO NOT MERGE
 2013-06-03 14:34:56 -07:00
The Android Open Source Project
b30d81d1dc Reconcile with jb-mr2-release - do not merge 
Change-Id: I0c4c9a3c4d05abbbde1198c2f4d0ee170a2ef7e5
 2013-06-03 14:03:56 -07:00
Baligh Uddin
804b8b60e7 Import translations. DO NOT MERGE 
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
 2013-06-03 11:48:00 -07:00
The Android Automerger
a778aa2499 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-02 05:55:48 -07:00
Baligh Uddin
971d090a37 am eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'eb0fff7a9a57202ce2a1f6fc43f6dab79e7e6d36':
  Import translations. DO NOT MERGE
 2013-06-01 08:23:29 -07:00
Baligh Uddin
eb0fff7a9a Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-31 22:43:38 +00:00
Jean-Baptiste Queru
8527d6d194 am 46cd7f64: Ignore 81476405 from AOSP 
* commit '46cd7f64f00f530de4478137281c4d47d02c9244':
  Settings: Fix Swedish translations
 2013-05-30 15:39:39 -07:00
Jean-Baptiste Queru
46cd7f64f0 Ignore 81476405 from AOSP 2013-05-30 15:37:47 -07:00
Jean-Baptiste Queru
8147640558 Merge "Settings: Fix Swedish translations" 2013-05-30 22:06:37 +00:00
Robert Greenwalt
f96cfad36e am 5ac90432: Don\'t show scan-always text if it is off. 
* commit '5ac904321d81a0a0b7892c5722c464dc3c693f9f':
  Don't show scan-always text if it is off.
 2013-05-30 12:06:30 -07:00
Robert Greenwalt
5ac904321d Don't show scan-always text if it is off. 
bug:9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
 2013-05-30 11:33:36 -07:00
Baligh Uddin
586376a036 Import translations. DO NOT MERGE 
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
 2013-05-29 19:29:10 -07:00
The Android Open Source Project
ed7bc2fa00 Reconcile with jb-mr2-release - do not merge 
Change-Id: I9c8cb7d1325cc9edf656205ce7f5728cc76040ab
 2013-05-29 08:06:16 -07:00
The Android Automerger
0013525263 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-29 05:55:30 -07:00
Baligh Uddin
5fd8a31187 am 1182f675: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '1182f6755f17753f5b551ea40c11c263801a90c1':
  Import translations. DO NOT MERGE
 2013-05-28 21:00:23 -07:00
Baligh Uddin
1182f6755f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:56:37 +00:00
Russell Brenner
1f9e42cd40 am c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev 
* commit 'c280acc327fa7e8fbd6972534fbadb4650c1ee3d':
  Improved logic for Skip warning message
 2013-05-28 13:23:35 -07:00
Russell Brenner
c280acc327 Merge "Improved logic for Skip warning message" into jb-mr2-dev 2013-05-28 20:22:40 +00:00
The Android Open Source Project
52f3b7c391 Reconcile with jb-mr2-release - do not merge 
Change-Id: If34271bddb2819de365f53ba61b744b6598bda57
 2013-05-28 07:37:45 -07:00
Baligh Uddin
44338bae31 Import translations. DO NOT MERGE 
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
 2013-05-27 11:58:11 -07:00
The Android Automerger
f80c318799 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-26 05:55:43 -07:00
Russell Brenner
765f55f52a Improved logic for Skip warning message 
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.

Bug: 9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
 2013-05-24 16:09:39 -07:00
Baligh Uddin
5c20af4c7c am 6fa5e627: Import translations. DO NOT MERGE 
* commit '6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a':
  Import translations. DO NOT MERGE
 2013-05-23 09:30:23 -07:00
The Android Open Source Project
2dafd362c7 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c
 2013-05-23 08:05:45 -07:00
The Android Automerger
e874242f22 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-23 05:55:31 -07:00
Baligh Uddin
6fa5e627b8 Import translations. DO NOT MERGE 
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
 2013-05-23 00:31:54 -07:00
Amith Yamasani
7366262995 am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 
* commit '21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
  Update strings for clarity about restricted profiles
 2013-05-22 15:07:00 -07:00
Amith Yamasani
21f008e1f4 Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 2013-05-22 22:04:59 +00:00
Alex Klyubin
1eb2064ff4 am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 
* commit '7229e29f1749ae10bd92b59ec3d663698a5045e7':
  Ensure all active Device Admins are listed.
 2013-05-22 14:09:10 -07:00
Alex Klyubin
7229e29f17 Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 2013-05-22 21:06:32 +00:00
Dianne Hackborn
eeeccdc6a3 am 8274b677: Fix issue #9074296: Device Admins can activate in a way... 
* commit '8274b6770219a469ab8a5254206d0d81bd5c96d3':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-05-22 14:01:26 -07:00
Amith Yamasani
7c4dfccda4 Update strings for clarity about restricted profiles 
Bug: 9051422
Bug: 9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
 2013-05-22 12:51:30 -07:00
Dianne Hackborn
8274b67702 Fix issue #9074296: Device Admins can activate in a way... 
...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
 2013-05-22 11:50:23 -07:00
Alex Klyubin
d14258e50e Ensure all active Device Admins are listed. 
Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
 2013-05-22 09:08:53 -07:00
The Android Open Source Project
ae006e7077 Reconcile with jb-mr2-release - do not merge 
Change-Id: I2a202b7c38568ae9ca45a38cc01f08be05ab5d23
 2013-05-22 07:23:09 -07:00
The Android Automerger
26d3a95a08 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-22 05:55:35 -07:00
Amith Yamasani
18d44684d3 am 0b2781ae: Write restriction bundle right away for required apps. 
* commit '0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
  Write restriction bundle right away for required apps.
 2013-05-21 18:16:50 -07:00
Amith Yamasani
0b2781ae53 Write restriction bundle right away for required apps. 
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.

The app entry is also automatically removed from the list if there are no visible
restrictions.

Bug: 9074051

Also fix an incorrect dialog label. Bug: 9068877

Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
 2013-05-21 16:07:28 -07:00
The Android Open Source Project
7e18ed8c14 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6a178af29be7f1d227b667ec84312f5d0c2fdadd
 2013-05-21 08:59:23 -07:00
The Android Automerger
baa0d18d73 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-21 07:47:00 -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
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