PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,227 Commits 1 Branch 0 Tags
a8b154f2f04c6130a65c0b45947e01a896e47cd9
Commit Graph

17227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
8a343c4421 am 3c05c164: am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit '3c05c164bfb640990102734e73884252b803abe8':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:18:02 +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
cd16c4bb04 am 7be19184: am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 
* commit '7be191843ad6b2c84d054fe7a665fcb2e768b954':
  Migrated search for SubInfoRecord to Utils.
 2014-11-07 22:40:13 +00: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
a66826e387 am 80b7a2e4: am b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 
* commit '80b7a2e4224195ab41a9098b7f8217dd2626fc41':
  Set default sim name and carrier name from subinforecord object.
 2014-11-07 20:03:51 +00: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
fbacdbdc5f am 330fc418: am 293d9744: Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 
* commit '330fc41823e3982d183b6c96bf794f63476bb856':
  Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted
 2014-11-07 19:24:10 +00:00
Fabrice Di Meglio
e8b40c950b am d762aaab: am 2a4f034d: Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 
* commit 'd762aaabd28242a50ec6493151b8f2dbb74e0edb':
  Fix bug #17936169 subsettings activity crashes on emulator for android-21
 2014-11-07 19:24:09 +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
Fabrice Di Meglio
293d974482 Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 2014-11-07 19:14:04 +00:00
Fabrice Di Meglio
2a4f034da4 Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 2014-11-07 19:13:27 +00:00
Sanket Padawe
d21b45e01c Set default sim name and carrier name from subinforecord object. 
Changes for retrieving display name and carrier name from subinforecord
object.

Bug: 18247211
Bug: 17732079
Bug: 17321641
Change-Id: I718700648ddd5a2646c720591ce776bd30a03543

Conflicts:
	src/com/android/settings/sim/SimSettings.java
 2014-11-07 18:06:49 +00:00
Jason Monk
0ae5f6037b am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'dac36fafbe5757bdfc44d50e93c4e2771fbc71e0':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:07:02 +00:00
Jason Monk
dac36fafbe am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'cc0a2c554a8a576df2dbf4f564970cd67cd34e77':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:02:03 +00:00
Jason Monk
cc0a2c554a Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 2014-11-07 16:58:37 +00:00
Jason Monk
d570e9839e Screen pinning: fix strings and add scrollview 
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.

Bug: 18287056
Bug: 17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
 2014-11-07 11:46:33 -05:00
Alexandra Gherghina
6002ff8dce Update sync state immediately after accounts are shown 
Bug: 18251114
Change-Id: I13791ff3979ce862e11989a3819f2356be32a0f4
 2014-11-07 15:24:28 +00:00
Baligh Uddin
a42a440322 am 00585e42: (-s ours) am 5d6b47c1: (-s ours) am 960c98f9: (-s ours) Import translations. DO NOT MERGE 
* commit '00585e420a44aa37c92d16ae93ecc34bbb5fe0f5':
  Import translations. DO NOT MERGE
 2014-11-07 15:19:27 +00:00
Baligh Uddin
00585e420a am 5d6b47c1: (-s ours) am 960c98f9: (-s ours) Import translations. DO NOT MERGE 
* commit '5d6b47c1a21bd3d283f95aae4671b3667f511515':
  Import translations. DO NOT MERGE
 2014-11-07 15:15:36 +00:00
Baligh Uddin
040cb642e3 am 886ac25c: (-s ours) am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '886ac25c6965998f46c6027eb42122a62523b151':
  Import translations. DO NOT MERGE
 2014-11-07 15:11:28 +00:00
Baligh Uddin
5d6b47c1a2 am 960c98f9: (-s ours) Import translations. DO NOT MERGE 
* commit '960c98f91d44a9f9dfa5276f62e55f16e557e685':
  Import translations. DO NOT MERGE
 2014-11-07 15:08:07 +00:00
Baligh Uddin
ccd9fb5bde am 5fbfdc83: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '5fbfdc83e4800919363fa7387b1fb80672ff4b11':
  Import translations. DO NOT MERGE
 2014-11-07 15:06:54 +00:00
Baligh Uddin
886ac25c69 am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '449dc733e313b889a159a8776bd09cacbc0c34ae':
  Import translations. DO NOT MERGE
 2014-11-07 15:06:32 +00:00
Baligh Uddin
449dc733e3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:03:15 +00:00
Baligh Uddin
5fbfdc83e4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:03:01 +00:00
Alexandra Gherghina
bea0f7f9a0 am a4a7b739: am c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev 
* commit 'a4a7b739ac22413f886180440d6ccfba1e373c31':
  Disable app notifications checkbox for uninstalled apps
 2014-11-07 10:44:53 +00:00