PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,357 Commits 1 Branch 0 Tags
9986ca49d62d545156068c3625ebdf7f5edf7e0d
Commit Graph

18357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
9986ca49d6 am 3da30aab: am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 
* commit '3da30aabf18dcb0107894d7ef400f417cc665f5d':
  Remove backup preferences if backup service is inactive
 2014-11-21 15:37:25 +00:00
Zoltan Szatmary-Ban
3da30aabf1 am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 
* commit '208a8490c9fe6cfa3899c8c41f95afa539863711':
  Remove backup preferences if backup service is inactive
 2014-11-21 15:32:33 +00:00
Zoltan Szatmary-Ban
208a8490c9 am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 
* commit '5875aefa8a48cd90a1245303c42c171c2f4962b4':
  Remove backup preferences if backup service is inactive
 2014-11-21 15:29:01 +00:00
Zoltan Szatmary-Ban
61d0017cc1 am cf8255a0: am ad8191d9: am b85025d9: Strings for multiprofile Location Settings. 
* commit 'cf8255a0b150118a4c1f8703fe49d333d3fe0298':
  Strings for multiprofile Location Settings.
 2014-11-21 15:28:04 +00:00
Zoltan Szatmary-Ban
cf8255a0b1 am ad8191d9: am b85025d9: Strings for multiprofile Location Settings. 
* commit 'ad8191d95e4dfa296f276e68647e216502bf4d36':
  Strings for multiprofile Location Settings.
 2014-11-21 15:23:31 +00:00
Zoltan Szatmary-Ban
5875aefa8a Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 2014-11-21 15:21:34 +00:00
Zoltan Szatmary-Ban
ad8191d95e am b85025d9: Strings for multiprofile Location Settings. 
* commit 'b85025d98b7c9d28c9ee2b26ce3c9d11929aeb3a':
  Strings for multiprofile Location Settings.
 2014-11-21 15:18:59 +00:00
Zoltan Szatmary-Ban
b85025d98b Strings for multiprofile Location Settings. 
Bug: 17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3
 2014-11-21 15:10:23 +00:00
Amith Yamasani
75054383e2 am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 
automerge: 0775058

* commit '07750584c8c20dc220b5ed66756bb0a31508e1c9':
  Watch out for deleted user when exiting async task
 2014-11-21 03:27:36 +00:00
Wink Saville
6eeede1f04 am 14d486de: am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 514b6e8 
* commit '14d486de9553e2adddd937616a7895d4301f2417':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:10 +00:00
Wink Saville
1e8a3be5ad am 75730eac: am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: b8b8bb2 
* commit '75730eacb893f141c0da2bed0eeb06c71b3ffa04':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:57:08 +00:00
Amith Yamasani
07750584c8 am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 
* commit 'aa96cbec46dc2fce7eabd660ad08c1ef8326dbb3':
  Watch out for deleted user when exiting async task
 2014-11-21 02:48:18 +00:00
Wink Saville
14d486de95 am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
automerge: 514b6e8

* commit '514b6e8bb8d4893498f0f1b5c35d70cd77ceecac':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:41:26 +00:00
Wink Saville
75730eacb8 am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: b8b8bb2

* commit 'b8b8bb2fa8e086bfe95e024eee39b4e742c53a77':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:40:46 +00:00
Jeff Davidson
f73f5b6d63 am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 
automerge: 32b7def

* commit '32b7def42f912ea527427892f4d95d277e4851fc':
  Final strings for Wi-Fi Assistant in platform settings.
 2014-11-21 01:55:01 +00:00
Amith Yamasani
aa96cbec46 am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 
* commit '0cc764beed2b816ee7e092591c7f205601e1b596':
  Watch out for deleted user when exiting async task
 2014-11-21 01:50:50 +00:00
Amith Yamasani
0cc764beed Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 2014-11-21 01:47:20 +00:00
Jeff Davidson
32b7def42f am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 
* commit '9503a00c587bff45d09206af309abc87b8f138df':
  Final strings for Wi-Fi Assistant in platform settings.
 2014-11-21 00:44:02 +00:00
Zoltan Szatmary-Ban
2a7a9f6b9e am ead7991d: am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev automerge: 72b1985 
* commit 'ead7991dead5f2c5886778ac4d9b31f0ac300101':
  Show managed profile accounts on Settings > Factory Reset
 2014-11-20 21:29:12 +00:00
Paul Crowley
05c3b5e929 am a41edb6c: am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev automerge: 50c67366 
* commit 'a41edb6c662ba5fa42f0e57b8dc3e3612697e31f':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-20 21:29:11 +00:00
Zoltan Szatmary-Ban
ead7991dea am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 
automerge: 72b1985

* commit '72b198508a3e2db38541e49a85229d363fdef3ae':
  Show managed profile accounts on Settings > Factory Reset
 2014-11-20 21:25:42 +00:00
Paul Crowley
a41edb6c66 am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev 
automerge: 50c67366

* commit '50c673660ef54242bcaefbf838e40d54bdaf6e84':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-20 21:23:50 +00:00
Amith Yamasani
45f86236e4 Watch out for deleted user when exiting async task 
Fixes a problem where the async task can take a while to execute
and in the meantime the user can be removed. On exiting the async
task and updating the UI, make sure the user hasn't been deleted.

Bug: 18411181
Change-Id: I1831f3e53084c49e27557cb7aacec78c753a611b
 2014-11-20 13:19:18 -08:00
Fyodor Kupolov
fd06f01481 am 158717ed: am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev automerge: 4a0d6f3 
* commit '158717edaaa7b74787cd3e1ae6bf1f23e7dc854f':
  Added a check if a custom activity can be started
 2014-11-20 21:13:25 +00:00
Fyodor Kupolov
158717edaa am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev 
automerge: 4a0d6f3

* commit '4a0d6f3e1196a545d56337e2934b273d7d0655a6':
  Added a check if a custom activity can be started
 2014-11-20 21:06:20 +00:00
Wink Saville
514b6e8bb8 am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
* commit 'b9b69faf5ff4ba1a944b180b7240ad1f95e9acea':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-20 20:34:30 +00:00
Wink Saville
b9b69faf5f Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:30:48 +00:00
Wink Saville
b8b8bb2fa8 am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'db2e05d89e0b99b226fce9cc3af8552745f5e4ca':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-20 20:27:46 +00:00
Wink Saville
9aa0dd69c5 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit 1285f74fcb.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
 2014-11-20 20:27:34 +00:00
Wink Saville
db2e05d89e Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:21:29 +00:00
Zoltan Szatmary-Ban
876a21bae8 Remove backup preferences if backup service is inactive 
Also show informative message instead.

Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
 2014-11-20 20:20:49 +00:00
Jeff Davidson
9503a00c58 am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 
* commit '101743f9ecccae0054ba5867ae0585750a0a8bd2':
  Final strings for Wi-Fi Assistant in platform settings.
 2014-11-20 18:43:00 +00:00
Jeff Davidson
101743f9ec Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 2014-11-20 18:37:53 +00:00
Zoltan Szatmary-Ban
72b198508a am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 
* commit '548460bda5d37b22165b8e9e4e6349699910795a':
  Show managed profile accounts on Settings > Factory Reset
 2014-11-20 14:10:14 +00:00
Zoltan Szatmary-Ban
548460bda5 Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 2014-11-20 14:06:14 +00:00
Paul Crowley
50c673660e am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev 
* commit '67b4af148db7638ba6fb9ed84efb258f6c7e1c88':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-20 10:49:27 +00:00
Paul Crowley
67b4af148d Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev 
Conflicts:
	src/com/android/settings/CryptKeeper.java

Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da
 2014-11-20 10:37:39 +00:00
Fyodor Kupolov
4a0d6f3e11 am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev 
* commit '5925e1912e576e90d96a61403d658d70ca95bfce':
  Added a check if a custom activity can be started
 2014-11-19 22:22:57 +00:00
Fyodor Kupolov
5925e1912e Merge "Added a check if a custom activity can be started" into lmp-mr1-dev 2014-11-19 22:20:25 +00:00
Paul Crowley
1cb45399d3 Prevent factory reset for short passwords in CryptKeeper 
automerge: 8fca3fc

* commit '8fca3fcc06cfa7c4baf16b3bc53c4e52c9678fbb':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-19 20:49:13 +00:00
Jeff Davidson
13b2a28463 Final strings for Wi-Fi Assistant in platform settings. 
Bug: 13780935
Change-Id: I70a22b3f439d05570d2508f8e05ed3aa9627e8f1
 2014-11-19 11:59:11 -08:00
Geoff Mendal
f1d88a2663 am d716d474: (-s ours) am 6ed3dc44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'd716d4749cf8aad2510a314f8a7398dd0aa82265':
  Import translations. DO NOT MERGE
 2014-11-19 19:40:39 +00:00
Geoff Mendal
c0071dc977 am d15068d1: (-s ours) am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE 
* commit 'd15068d15a2acdbcc25900f1684eb8b48a996627':
  Import translations. DO NOT MERGE
 2014-11-19 19:36:27 +00:00
Geoff Mendal
d716d4749c am 6ed3dc44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6ed3dc44b6a7abca582f2e05656562c09af369b0':
  Import translations. DO NOT MERGE
 2014-11-19 19:36:06 +00:00
Geoff Mendal
d15068d15a am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE 
* commit '328483aa1bd64ec1275dc543f8e67f868e3f6122':
  Import translations. DO NOT MERGE
 2014-11-19 19:32:17 +00:00
Geoff Mendal
6ed3dc44b6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-19 19:31:02 +00:00
Geoff Mendal
328483aa1b am 36d2656f: (-s ours) Import translations. DO NOT MERGE 
* commit '36d2656f963e29b3290c50664677bd95fe51240b':
  Import translations. DO NOT MERGE
 2014-11-19 19:27:37 +00:00
Geoff Mendal
41ae403fa0 Import translations. DO NOT MERGE 
Change-Id: Iab22f476ee0efb824690089ee1b12efe44eba77f
Auto-generated-cl: translation import
 2014-11-19 11:19:12 -08:00
Geoff Mendal
3b77e45e5c Import translations. DO NOT MERGE 
Change-Id: I6ac6d662765779e610a210ad7ac792e7543af3fc
Auto-generated-cl: translation import
 2014-11-19 11:08:37 -08:00
Geoff Mendal
36d2656f96 Import translations. DO NOT MERGE 
Change-Id: Id90b273276938939b6e68b00149e54e8ec146ca6
Auto-generated-cl: translation import
 2014-11-19 11:03:40 -08:00