PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,779 Commits 1 Branch 0 Tags
2ad430e74288be0af1db2c7623beebd76e5af20c
Commit Graph

18779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
32830286e8 am 0193911e: Settings: Tweak doze settings description. 
automerge: 9259316

* commit '925931601d48a0cdec885f1a381339f78c282bcf':
  Settings: Tweak doze settings description.
 2014-11-11 18:51:45 +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
db73eae8d9 am 1f382c6a: Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b automerge: 28c275e 
* commit '1f382c6a4fece4de542996adb27054088784503c':
  Settings: Update preference summary per new downtime behavior.
 2014-11-11 02:50:24 +00:00
John Spurlock
1f382c6a4f Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b 
automerge: 28c275e

* commit '28c275ed7035deb99154eb7c1ded6f289f515a24':
  Settings: Update preference summary per new downtime behavior.
 2014-11-11 02:43:47 +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
601d38efac am a50e78ca: am 668b0e27: 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 'a50e78ca913c8525c46cb104581eb0e23a2e297f':
  Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button
 2014-11-11 01:03:13 +00:00
Fabrice Di Meglio
a50e78ca91 am 668b0e27: 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 '668b0e2756b98dc8c2096586c342c1ffa1eb5bbb':
  Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button
 2014-11-11 00:59:27 +00:00
Geoff Mendal
0e2bf443c1 am bb1e76b1: (-s ours) am 13da7679: (-s ours) am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb1e76b11ea9fda94e548897a1970956144f29e1':
  Import translations. DO NOT MERGE
 2014-11-11 00:54:42 +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
Geoff Mendal
bb1e76b11e am 13da7679: (-s ours) am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE 
* commit '13da7679407ad0a69e7f055689b3e502864697f2':
  Import translations. DO NOT MERGE
 2014-11-11 00:51:02 +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
19b8aaa5e1 am 72895bc5: (-s ours) am abece484: (-s ours) am 14343ad9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '72895bc5f088dc92ea158f628827e0ed1c6f08a3':
  Import translations. DO NOT MERGE
 2014-11-11 00:44:46 +00:00
Geoff Mendal
0e0e44bcb4 am bfa92ff2: (-s ours) am 305acf38: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'bfa92ff27d0bcb416274c4dcb73c84ddfd0ebb10':
  Import translations. DO NOT MERGE
 2014-11-11 00:44:44 +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
72895bc5f0 am abece484: (-s ours) am 14343ad9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'abece484b682c426b864ec877f352435db5f531c':
  Import translations. DO NOT MERGE
 2014-11-11 00:30:26 +00:00
Geoff Mendal
bfa92ff27d am 305acf38: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '305acf388ae93e312d7e51392b73ac02c8869b19':
  Import translations. DO NOT MERGE
 2014-11-11 00:30:25 +00:00
Geoff Mendal
632b08f4d0 Merge "Import translations. DO NOT MERGE" 2014-11-11 00:19:14 +00: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
0bda36df16 Import translations. DO NOT MERGE 
Change-Id: I937efd74232d29cf16ddf148661da8e0f2f6896e
Auto-generated-cl: translation import
 2014-11-10 14:33:04 -08: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
f9c285896c am a8b154f2: am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 
* commit 'a8b154f2f04c6130a65c0b45947e01a896e47cd9':
  Don't allow secondary users to change Wi-Fi assistants.
 2014-11-10 17:50:08 +00:00
Jeff Davidson
a8b154f2f0 am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 
* commit 'd39dc5c36b6f7a356f488f94fad74cd8c2ea6125':
  Don't allow secondary users to change Wi-Fi assistants.
 2014-11-10 17:45:46 +00: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
513b2cb97e am ac62d700: am ba1eba04: am 095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 
* commit 'ac62d70080140b8068e93ba43d3de167f5ac16d2':
  Update sync state immediately after accounts are shown
 2014-11-10 10:28:47 +00:00
Alexandra Gherghina
ac62d70080 am ba1eba04: am 095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 
* commit 'ba1eba04cc52fbf941f9d6977f47aafcb4b80993':
  Update sync state immediately after accounts are shown
 2014-11-10 10:24:06 +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
74d7841f24 am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f 
automerge: 2e6a170

* commit '2e6a170aa579a05b120d5b8c6d56250bbed54674':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-08 13:58:42 +00:00
Paul Crowley
2e6a170aa5 am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f 
* commit 'c1fcf22026d55d9f2cd6d0d354312e00b4081d4c':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-08 13:50:14 +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
Paul Crowley
6bd45c0eba am 40597ca0: Merge "Use the right message for pattern/password." into lmp-mr1-dev automerge: c44ad35 
automerge: 0475a3c

* commit '0475a3ccc508b0c61b23733f0ec27110910e21b2':
  Use the right message for pattern/password.
 2014-11-08 03:18:47 +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
0475a3ccc5 am 40597ca0: Merge "Use the right message for pattern/password." into lmp-mr1-dev automerge: c44ad35 
* commit '40597ca0e14dc3b5be90ff1d0c344316cffe0274':
  Use the right message for pattern/password.
 2014-11-08 03:00:06 +00: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
928052ebe8 am 48471e39: am fca698cb: am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev 
* commit '48471e397e6e63a72e0ff80df5bba9700d6f9cba':
  Update SubInfoRecord usage
 2014-11-08 00:25:17 +00:00
Stuart Scott
48471e397e am fca698cb: am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev 
* commit 'fca698cbeba3e9a18d388a9d627be2c28ac96d61':
  Update SubInfoRecord usage
 2014-11-08 00:21:10 +00:00