PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,917 Commits 1 Branch 0 Tags
4f2c003d6ae0db4b6d929e2de5e40d7ab01a76dc
Commit Graph

15917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vandwalle
4f2c003d6a Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 
automerge: 53ad50b

* commit '53ad50b05bd95157c1b0bcefe321b2a561dc2696':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 02:25:43 +00:00
Wink Saville
754da436c9 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 588611e

* commit '588611eea55ee3ef617d17ea89c16174935a6a1a':
  Update SubscriptionManager API as per API council.
 2014-11-12 02:24:06 +00:00
vandwalle
53ad50b05b Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 2014-11-12 01:18:38 +00:00
Amith Yamasani
8b955d1d47 Fix a regression in enabling unknown sources toggle 
automerge: ceceb2a

* commit 'ceceb2ab07aab457a4229d051de222ad88ed62a1':
  Fix a regression in enabling unknown sources toggle
 2014-11-12 01:13:42 +00:00
Wink Saville
588611eea5 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:27 +00:00
Amith Yamasani
ceceb2ab07 Fix a regression in enabling unknown sources toggle 
In Security Settings, allow unknown sources to be
toggled for primary and secondary users unless it
is a restricted profile or there is a device policy
restriction to disallow installing apps or installing
from unknown sources.

Bug: 18277370
Change-Id: I9f0b6cd603c4c8deb77d36af1b82cace43ba195f
 2014-11-11 23:39:58 +00:00
Alexandra Gherghina
5fc5de1f6a am aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev 
* commit 'aa762831729e7c91c10184f11b978bd501b94e71':
  Reorganize sync state menu options for accounts settings
 2014-11-11 22:48:25 +00:00
Alexandra Gherghina
aa76283172 Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev 2014-11-11 22:27:47 +00:00
John Spurlock
925931601d am 0193911e: Settings: Tweak doze settings description. 
* commit '0193911ea5a81e772a3d07e62af768559c36f1d5':
  Settings: Tweak doze settings description.
 2014-11-11 18:18:20 +00:00
John Spurlock
0193911ea5 Settings: Tweak doze settings description. 
Change-Id: If9241fabf8e097ef57049cfb2c7f75513f978759
 2014-11-11 13:07:09 -05:00
Wink Saville
ca7566125e Update SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
 2014-11-11 07:06:03 -08:00
Alexandra Gherghina
b2d9795cda Reorganize sync state menu options for accounts settings 
Fixes inverted condition for displaying the buttons, updates
at the right time and removes the useless dependence on mFirstAccount

Bug: 18310988
Change-Id: Id55e11a210aa58a10ee9613891470862d42b65ad
 2014-11-11 14:36:09 +00:00
John Spurlock
28c275ed70 Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev 
automerge: 64cb79b

* commit '64cb79bb6982ebe2907daed761d829dea4fef081':
  Settings: Update preference summary per new downtime behavior.
 2014-11-11 02:33:20 +00:00
John Spurlock
64cb79bb69 Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev 2014-11-11 02:22:19 +00:00
Fabrice Di Meglio
668b0e2756 am ded5a85a: Merge "Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev 
* commit 'ded5a85aad2262d71fead6533901eee96abf9378':
  Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button
 2014-11-11 00:52:49 +00:00
Fabrice Di Meglio
ded5a85aad Merge "Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev 2014-11-11 00:48:19 +00:00
Geoff Mendal
13da767940 am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE 
* commit '61fe962f9072dffd6ebbe9be2870b55ddd9617c5':
  Import translations. DO NOT MERGE
 2014-11-11 00:47:47 +00:00
Geoff Mendal
61fe962f90 am cafcb70a: (-s ours) Import translations. DO NOT MERGE 
* commit 'cafcb70a685d00c7cbbbfe477e1dad0f2fd980e6':
  Import translations. DO NOT MERGE
 2014-11-11 00:37:35 +00:00
Fabrice Di Meglio
c66a878813 Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button 
- prevent sending onRadioButtonClicked() if the radio button is already checked
- check the new current radio button

Change-Id: I7e4457bcba6eb1abf51fbe3902bc0f6df0f4bdcf
 2014-11-10 16:35:06 -08:00
Geoff Mendal
abece484b6 am 14343ad9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '14343ad9b81797b5b7c04373329e2a3de87bac12':
  Import translations. DO NOT MERGE
 2014-11-11 00:17:41 +00:00
Geoff Mendal
305acf388a Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-11 00:14:38 +00:00
Geoff Mendal
14343ad9b8 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-11 00:12:27 +00:00
Geoff Mendal
cafcb70a68 Import translations. DO NOT MERGE 
Change-Id: I6d7b0e7986c8ea87e557cda85144a3501f86fc29
Auto-generated-cl: translation import
 2014-11-10 14:21:23 -08:00
Geoff Mendal
fa0ed7a83f Import translations. DO NOT MERGE 
Change-Id: I239d9e96f7a88bb558ec2f14955ae98af32fab23
Auto-generated-cl: translation import
 2014-11-10 14:17:52 -08:00
Geoff Mendal
c0c56cad2b Import translations. DO NOT MERGE 
Change-Id: I89de05dbac32f4acf541a4a2d6cb3225652fd39b
Auto-generated-cl: translation import
 2014-11-10 14:12:28 -08:00
John Spurlock
49300d19ab Settings: Update preference summary per new downtime behavior. 
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
 2014-11-10 14:49:10 -05:00
Jeff Davidson
d39dc5c36b am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 
* commit '76f0133831693c9a932b8fb336401303fbadfc66':
  Don't allow secondary users to change Wi-Fi assistants.
 2014-11-10 17:40:09 +00:00
Jeff Davidson
76f0133831 Merge "Don't allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 2014-11-10 17:35:29 +00:00
Alexandra Gherghina
ba1eba04cc am 095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 
* commit '095521b2874b38d2de0d9dd5e4a1a70e628c58bb':
  Update sync state immediately after accounts are shown
 2014-11-10 10:19:12 +00:00
Alexandra Gherghina
095521b287 Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 2014-11-10 10:13:00 +00:00
Paul Crowley
c1fcf22026 Prevent factory reset for short passwords in CryptKeeper 
automerge: 2555e5f

* commit '2555e5f1040984a3422c5a4db43421e87d4ca0ce':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-08 03:36:30 +00:00
vandwalle
8be7ee3aac dont blacklist wifi config that have had validated internet status in the past 
Change-Id: I66f7fffe33b5dbe861445775dcc6135c6cbedf62
 2014-11-07 19:01:58 -08:00
Paul Crowley
40597ca0e1 Merge "Use the right message for pattern/password." into lmp-mr1-dev 
automerge: c44ad35

* commit 'c44ad35e51db79721821817e1b8e52dce632d2bf':
  Use the right message for pattern/password.
 2014-11-08 02:27:33 +00:00
Paul Crowley
2555e5f104 Prevent factory reset for short passwords in CryptKeeper 
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java
 2014-11-08 01:43:45 +00:00
Paul Crowley
c44ad35e51 Merge "Use the right message for pattern/password." into lmp-mr1-dev 2014-11-08 01:13:11 +00:00
Stuart Scott
fca698cbeb am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev 
* commit 'ab82c090d1f4549a256d4550b71c540b216e0a65':
  Update SubInfoRecord usage
 2014-11-08 00:15:54 +00:00
Stuart Scott
ab82c090d1 Merge "Update SubInfoRecord usage" into lmp-mr1-dev 2014-11-08 00:09:21 +00:00
Paul Crowley
a8c760691d Use the right message for pattern/password. 
Bug: 17875087
Change-Id: I7729a4fcb993def912e950ad0ea59fd64bfc34d3
 2014-11-07 23:54:56 +00:00
Stuart Scott
4d1a0165b4 Update SubInfoRecord usage 
bug: 17575308
Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d
 2014-11-07 23:53:56 +00:00
Fabrice Di Meglio
3c05c164bf am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit 'd9966523f0c5dc3c3a68c5e0ecfb1a0b1f2bca70':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:12:30 +00:00
Fabrice Di Meglio
d9966523f0 Merge "Fix bug #18289076 Storage graph colors don't match Material design spec" into lmp-mr1-dev 2014-11-07 23:07:05 +00:00
Fabrice Di Meglio
e7ed65602b Fix bug #18289076 Storage graph colors don't match Material design spec 
- update colors per UX request for matching Material Design colors spec

Change-Id: Ibee52ee0edef2d678d86e3960cd7ff058476a25e
 2014-11-07 14:46:20 -08:00
PauloftheWest
7be191843a am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 
* commit '5aafdda85ccfb0e3ad46a7ab0bac592893bddde8':
  Migrated search for SubInfoRecord to Utils.
 2014-11-07 22:36:01 +00:00
PauloftheWest
5aafdda85c Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 2014-11-07 22:28:47 +00:00
PauloftheWest
0a0dacaf17 Migrated search for SubInfoRecord to Utils. 
Bug: 18293625
Bug: 18293168
Bug: 18291246
Change-Id: Iad01a01d9b60ca010943447b00c1394471e93d5a
 2014-11-07 14:26:22 -08:00
Jeff Davidson
739ae972d0 Don't allow secondary users to change Wi-Fi assistants. 
This is not ideal but better than the current situation given that the
rest of the connectivity stack does not properly support multi-user.

Bug: 17320659
Change-Id: Ia0d4c746b4ebe6ce90df7ff39f0398ca78fd61f6
 2014-11-07 13:26:56 -08:00
Sanket Padawe
80b7a2e422 am b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 
* commit 'b58119b709acd370b722659a12ebc75bd9a32a4c':
  Set default sim name and carrier name from subinforecord object.
 2014-11-07 19:58:11 +00:00
Sanket Padawe
b58119b709 Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 2014-11-07 19:47:45 +00:00
Fabrice Di Meglio
330fc41823 am 293d9744: Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 
* commit '293d974482c89b9886f9451423f4619e23b5b186':
  Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted
 2014-11-07 19:18:17 +00:00
Fabrice Di Meglio
d762aaabd2 am 2a4f034d: Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 
* commit '2a4f034da4fa1a51e5a254942436d57facd4005b':
  Fix bug #17936169 subsettings activity crashes on emulator for android-21
 2014-11-07 19:18:16 +00:00