PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,557 Commits 1 Branch 0 Tags
eac414ae23a2b0db870ca5ed82b2900aa18e38cc
Commit Graph

16557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
af0f89ff91 Disambiguate categories in Settings > Trusted Credentials 
Use fixed category names (e.g. 'Personal' and 'Work') on Trusted Credentials
screen instead of names of profiles that may be the same (or similar) for both.

Bug: 17629895
Change-Id: I25b39310f7b9f445d2724be046a16cc82f5d1a9a
 2014-09-30 16:30:07 +01:00
Fabrice Di Meglio
85f76f3a7d Update Settings App icons 
Per UX request

See bug: #17703962 update Settings app icons

Change-Id: I3cc0010e498a6150d6633ae9f0def408db22c77a
 2014-09-29 19:17:56 -07:00
PauloftheWest
29aab7a2ad Fixed a Settings crash. 
+ When in Settings->More... we will no longer provide a tethering option
if tethering requires provisioning, but the provisioning app is invalid.

Bug: 17671381
Change-Id: I48a8178865a7ffddec714c1f6ee6f18d34801b60
 2014-09-29 14:58:27 -07:00
Baligh Uddin
91b315c1d6 am 02e6f611: (-s ours) am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '02e6f6115bfa5f9652560cf5a58827ed6c4b43fb':
  Import translations. DO NOT MERGE
 2014-09-29 21:00:28 +00:00
PauloftheWest
db46469432 am c4ef9bf8: am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit 'c4ef9bf82440764609356b3364e066a4b35a0114':
  Fixed multiple MAP issues.
 2014-09-29 21:00:27 +00:00
Baligh Uddin
02e6f6115b am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6cbdf17e7b8244601174295d2ddeb333c073cfc4':
  Import translations. DO NOT MERGE
 2014-09-29 20:50:31 +00:00
PauloftheWest
c4ef9bf824 am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit 'dc5f87fffceac79169fe546055f2ecc3a4142bfe':
  Fixed multiple MAP issues.
 2014-09-29 20:50:30 +00:00
Baligh Uddin
6cbdf17e7b am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
  Import translations. DO NOT MERGE
 2014-09-29 20:41:53 +00:00
PauloftheWest
dc5f87fffc am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit '709ddd5c24ca276e0c2efc76c77ae375276cc080':
  Fixed multiple MAP issues.
 2014-09-29 20:41:53 +00:00
Baligh Uddin
5c664d8e20 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:37:22 +00:00
PauloftheWest
709ddd5c24 Merge "Fixed multiple MAP issues." into lmp-dev 2014-09-29 15:10:23 +00:00
Baligh Uddin
a69eafa6c8 Import translations. DO NOT MERGE 
Change-Id: Ic77eba24209b5d24e9272fb70f3c828e5f04d422
Auto-generated-cl: translation import
 2014-09-29 00:31:03 -07:00
Robert Greenwalt
a3c7a104b3 am 42dd9335: am 20371b52: am 613620df: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev 
* commit '42dd933597c350308629227f6b82b653a020a857':
  ATT Entitlement changes in Settings to pass Tether Type.
 2014-09-27 00:27:08 +00:00
Robert Greenwalt
42dd933597 am 20371b52: am 613620df: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev 
* commit '20371b52c4e103e481ae0deb14ce395a1deeb5d5':
  ATT Entitlement changes in Settings to pass Tether Type.
 2014-09-27 00:22:36 +00:00
Robert Greenwalt
20371b52c4 am 613620df: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev 
* commit '613620df13f01c9871a71c83e4df8cc58031478e':
  ATT Entitlement changes in Settings to pass Tether Type.
 2014-09-27 00:18:16 +00:00
Robert Greenwalt
613620df13 am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev 
* commit 'ce77a43abfb05ee6011ebf6e5ced8dd11e163dcf':
  ATT Entitlement changes in Settings to pass Tether Type.
 2014-09-27 00:13:17 +00:00
Robert Greenwalt
ce77a43abf Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev 2014-09-27 00:09:02 +00:00
Elliott Hughes
00d038df28 am 100bed71: am 38c42ec1: am 66392541: am ed6a6ca0: Make the system locale available to the decryption UI. 
* commit '100bed71759dee76a31b59af8dfbb4a522ebcf66':
  Make the system locale available to the decryption UI.
 2014-09-26 23:13:55 +00:00
Elliott Hughes
100bed7175 am 38c42ec1: am 66392541: am ed6a6ca0: Make the system locale available to the decryption UI. 
* commit '38c42ec165f6257e86d61dcb74016774205890e1':
  Make the system locale available to the decryption UI.
 2014-09-26 23:08:25 +00:00
Elliott Hughes
38c42ec165 am 66392541: am ed6a6ca0: Make the system locale available to the decryption UI. 
* commit '66392541346505eaa4825323bb4ba28f55f1d136':
  Make the system locale available to the decryption UI.
 2014-09-26 23:03:52 +00:00
Elliott Hughes
6639254134 am ed6a6ca0: Make the system locale available to the decryption UI. 
* commit 'ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6':
  Make the system locale available to the decryption UI.
 2014-09-26 22:58:34 +00:00
Elliott Hughes
ed6a6ca026 Make the system locale available to the decryption UI. 
Bug: 17659622
Change-Id: I8f7d1c4d1d04ec483b6a3c9bea742f79374b647a
 2014-09-26 15:17:35 -07:00
Rohit Sisodia
37155e9633 ATT Entitlement changes in Settings to pass Tether Type. 
ATT has different provisioning servers for BT,Wifi and USB Tethering and
Entitlement app need the type of Tethering to be passed before provisioning
request goes out.

Bug:17640036

Change-Id: I6683a747e1925716575ba683aeefc644ced7e37f
 2014-09-26 15:09:03 -07:00
Alexandra Gherghina
24d0b6cc62 am b496606d: am e5e43084: am 8ea6cbf7: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit 'b496606ddcd1d43b8791b6bbd8399cf5c13c8b7a':
  Match parent width for user spinner to fix tint
 2014-09-26 21:52:43 +00:00
Alexandra Gherghina
f458406f40 am 294c32ce: am 5dab2fd3: am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 
* commit '294c32ce458b9d53796387cd59ba1cab3cd592ce':
  Use plain user icon in UserSpinnerAdapter
 2014-09-26 21:52:42 +00:00
PauloftheWest
3708cce505 am e03d52be: am 6a662321: am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit 'e03d52beed9db5e965ecca19c59ab619760f86bb':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 21:52:41 +00:00
Alexandra Gherghina
b496606ddc am e5e43084: am 8ea6cbf7: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit 'e5e430849c9cd6fce13c3194ab681c97822c180b':
  Match parent width for user spinner to fix tint
 2014-09-26 20:46:00 +00:00
Alexandra Gherghina
294c32ce45 am 5dab2fd3: am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 
* commit '5dab2fd3b21f561fc5d5874566762ea88b260725':
  Use plain user icon in UserSpinnerAdapter
 2014-09-26 20:45:59 +00:00
Alexandra Gherghina
e5e430849c am 8ea6cbf7: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit '8ea6cbf7d9a6f92bb76564c281597341b0ad1ebb':
  Match parent width for user spinner to fix tint
 2014-09-26 20:11:30 +00:00
Alexandra Gherghina
5dab2fd3b2 am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 
* commit 'c7611429e906423c5f7ba9da80e40bb364c684b1':
  Use plain user icon in UserSpinnerAdapter
 2014-09-26 20:11:29 +00:00
Alexandra Gherghina
8ea6cbf7d9 am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit '9de68440a9ae9cfadee3939c1ca461e42871f766':
  Match parent width for user spinner to fix tint
 2014-09-26 19:55:28 +00:00
Alexandra Gherghina
c7611429e9 am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 
* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
  Use plain user icon in UserSpinnerAdapter
 2014-09-26 19:55:27 +00:00
Alexandra Gherghina
9de68440a9 Merge "Match parent width for user spinner to fix tint" into lmp-dev 2014-09-26 17:53:28 +00:00
Alexandra Gherghina
3c3ceb9d42 Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 2014-09-26 17:42:49 +00:00
PauloftheWest
e03d52beed am 6a662321: am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit '6a6623215545a59a9cebb5f87cb0cb71a586ec6d':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 15:15:41 +00:00
PauloftheWest
6a66232155 am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit '0c74ea6cc58054e8bfb74ee1eda4453ac10567ce':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 15:04:41 +00:00
PauloftheWest
0c74ea6cc5 am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit '3aabfca462af26c487d2a834f70d0998d7556637':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 14:54:19 +00:00
PauloftheWest
3aabfca462 Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 2014-09-26 14:47:28 +00:00
Michael Wright
d26109e86f am 94a72da1: am 65c402ef: am 28a049a6: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '94a72da1316a3a7e2dd1b86943a3d9a186965dd0':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-26 04:29:14 +00:00
Michael Wright
94a72da131 am 65c402ef: am 28a049a6: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '65c402ef9a58bc94056cbff5a93405da06c575dd':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-25 22:50:06 +00:00
Michael Wright
65c402ef9a am 28a049a6: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '28a049a69471f1cdb7dce4490ffea38c1b3f417e':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-25 22:38:32 +00:00
Michael Wright
28a049a694 am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '1b87bec5de17dc23cf63d9f71358b8c979f8c896':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-25 22:26:59 +00:00
Michael Wright
1b87bec5de Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 2014-09-25 22:18:34 +00:00
PauloftheWest
a7d31e8164 Fixed a crash when rotating a WPS dialog. 
Bug: 17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638
 2014-09-25 12:36:09 -07:00
Zoltan Szatmary-Ban
9892f72a14 am cb4ec69c: am 8c6211b5: am 15f71b3f: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 
* commit 'cb4ec69ccc3d372ee26028396fb8dd439c036d64':
  Make Force Stop button work for packages of managed profile
 2014-09-25 18:32:33 +00:00
Zoltan Szatmary-Ban
d1ce0ec8cd am bfb2dd48: am 2a26ac58: am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit 'bfb2dd48cbc049c225c2b56cbe4fbe5b8b8bd0b9':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 18:32:32 +00:00
Alexandra Gherghina
fe9fb0625d am 9e9b5496: am 72cf0cf9: am 94e2341b: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit '9e9b54961d8e59bd89505dc8f20b337995cc2fcc':
  Add null check for sync authorities of an account type
 2014-09-25 18:32:31 +00:00
Jeff Sharkey
f306516602 am 390b0bae: am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit '390b0bae5ddc0cf400d09193fea06e02630d8a41':
  Include reason when wiping data.
 2014-09-25 18:32:30 +00:00
Zoltan Szatmary-Ban
cb4ec69ccc am 8c6211b5: am 15f71b3f: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 
* commit '8c6211b56f2272e38031ca845afe5a11a5b1e8e6':
  Make Force Stop button work for packages of managed profile
 2014-09-25 16:57:52 +00:00
Zoltan Szatmary-Ban
bfb2dd48cb am 2a26ac58: am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit '2a26ac58f025ea510800053b97aa39bef16091fa':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 16:57:51 +00:00