PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,003 Commits 1 Branch 0 Tags
0e01f128ab8a8525a4d3fd72980e468f4de1e56c
Commit Graph

11003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
3734178c41 am 8527d6d1: am 46cd7f64: Ignore 81476405 from AOSP 
* commit '8527d6d194eb92a4f61696c0a7b298538f7cf87b':
  Settings: Fix Swedish translations
 2013-05-30 15:43:08 -07: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
Robert Greenwalt
c236091229 am f96cfad3: am 5ac90432: Don\'t show scan-always text if it is off. 
* commit 'f96cfad36ef62154b52e846736ebc407f4c03de6':
  Don't show scan-always text if it is off.
 2013-05-30 15:16:05 -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
d5bc04c03f Import translations. DO NOT MERGE 
Change-Id: I5cf93cb32c6e8ceebe3172192d30114d84305993
Auto-generated-cl: translation import
 2013-05-29 19:32:14 -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
Svetoslav
3303e77631 Merge "Remove Auto-rotate screen setting if a required feature is missing." 2013-05-29 22:09:18 +00:00
Amith Yamasani
03eed8ec3f Merge "Reduce jank in User Settings" 2013-05-29 16:42:15 +00:00
Amith Yamasani
e9c3c28f68 Merge "Cache default circle avatar for faster creation of UserSettings" 2013-05-29 16:42:00 +00:00
Amith Yamasani
f14e6751c3 Reduce jank in User Settings 
Don't recreate the list on resume.
Cache the default circled icon.

Bug: 8802380
Change-Id: I46520b591fc3ffd5e51a1c7dda86e811c03a76a2
 2013-05-29 09:39:07 -07:00
The Android Open Source Project
7a001b3e9f am ed7bc2fa: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'ed7bc2fa007ced0587672428b788dc4bb9c2451f':
 2013-05-29 08:10:37 -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
731b4c3eb4 am 5fd8a311: (-s ours) am 1182f675: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '5fd8a3118784942fde17f6e5958dcfbfd21dcaaf':
  Import translations. DO NOT MERGE
 2013-05-28 21:02:51 -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
83147cd4c4 Merge "Import translations. DO NOT MERGE" 2013-05-29 03:57:30 +00:00
Baligh Uddin
1182f6755f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:56:37 +00:00
Russell Brenner
aa0b0b19e9 am 1f9e42cd: am c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev 
* commit '1f9e42cd4054aaf02b01cc3937924a08aa6b7529':
  Improved logic for Skip warning message
 2013-05-28 13:51:03 -07:00
The Android Open Source Project
009e8bca18 am 52f3b7c3: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '52f3b7c3919a0ca35b4679b5227468efb1b4d459':
 2013-05-28 13:50:23 -07: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
Amith Yamasani
503783c482 Cache default circle avatar for faster creation of UserSettings 
Change-Id: Ie2ed9d032f71fad7a89edde147f231a1dc479aae
 2013-05-28 11:17:43 -07: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
a72aa4e1f7 Import translations. DO NOT MERGE 
Change-Id: I609dc6aef43a669bf59f2fc352fefa1db2d8e844
Auto-generated-cl: translation import
 2013-05-27 12:01:18 -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
6eb937b9e9 am 5c20af4c: (-s ours) am 6fa5e627: Import translations. DO NOT MERGE 
* commit '5c20af4c7c45e3da2150937d222f85c80b0965b8':
  Import translations. DO NOT MERGE
 2013-05-23 09:32:47 -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
Baligh Uddin
3c5354bbf7 Merge "Import translations. DO NOT MERGE" 2013-05-23 16:26:46 +00:00
The Android Open Source Project
624191ecd8 am 2dafd362: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '2dafd362c7052f1618b0d22d18043d99f4544ac0':
 2013-05-23 08:06:41 -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
3317434180 Import translations. DO NOT MERGE 
Change-Id: I5c46faf0aa951cad097747f89fc4427e83bafa1a
Auto-generated-cl: translation import
 2013-05-23 00:35:21 -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
99f40d4758 am 73662629: am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 
* commit '73662629957e03ef23cd1bc33640ce7d1e690e90':
  Update strings for clarity about restricted profiles
 2013-05-22 15:08:53 -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
20c94a627b am 1eb2064f: am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 
* commit '1eb2064ff495b60bbf5db1a188adcad2e677742b':
  Ensure all active Device Admins are listed.
 2013-05-22 14:10:50 -07: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
be6e37a7e8 am eeeccdc6: am 8274b677: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'eeeccdc6a3ab5640233ff46dc8864c1235687f09':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-05-22 14:03:05 -07: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
38562ce3ae am ae006e70: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'ae006e7077c9937bd90d08f7eea7fb7e580b1d57':
 2013-05-22 07:27:38 -07:00