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
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
Simranjit Singh Kohli
7df0b799a8 [New RemoveAccount API in Settings App]: 
Modify Settings app to use the new account remove API

Bug: 18292092
Change-Id: I5f02d71bc0c7ca3e38157d38dea077c6fe6eb34e
 2014-11-19 17:01:32 -08:00
Sanket Padawe
d0c0a479b0 Changing hint string inside sim name editor dialog in settings. 
Chaning hint string from "Enter SSID" to "Enter SIM name" inside sim name
editor dialog in sim settings.

Bug: 18455476
Change-Id: I3ac58e23a23d6afa31b84ec1296623e0443f3cff
 2014-11-19 16:50:28 -08: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
Sanket Padawe
79e44da1ba Changing sim selection dialog in Settings to use phoneAccount 
Changing sim selection dialog in Settings UI to select Call to display icons using
 phoneAccount.

Bug: 18435598
Change-Id: Ib89344be123c77a56e04a65dbb9e297f05e204eb
 2014-11-19 18:45:27 +00:00
Wink Saville
1285f74fcb Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 10:34:28 -08:00
Paul Crowley
8fca3fcc06 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

Conflicts:
	src/com/android/settings/CryptKeeper.java
 2014-11-19 12:00:32 +00:00
Fyodor Kupolov
07ab95c43e Added a check if a custom activity can be started 
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
 2014-11-18 17:12:54 -08:00
Alexandra Gherghina
af49caf6b7 am fbf9642b: am c11a94e9: am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev 
* commit 'fbf9642bee2e0aaa24770c282e21be674cb4b5b5':
  Fix NPE caused by status update outside activity lifecycle
 2014-11-18 20:20:27 +00:00
Sanket Padawe
d1cb0d3805 am 1115d938: am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit '1115d93887de1b758fa120dc9a4caa7278dd4a96':
  Adding icons to sim color selection in settings UI.
 2014-11-18 20:17:51 +00:00
PauloftheWest
ed6cf9c191 am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
  Created Multi-SIM notifications.
 2014-11-18 20:17:50 +00:00
Geoff Mendal
cc53556d3f am 450d9c33: (-s ours) am ab247fa4: (-s ours) am 2321682d: (-s ours) am f0450338: (-s ours) Import translations. DO NOT MERGE 
* commit '450d9c33d0df63ddff5e4775b42178cd60b62446':
  Import translations. DO NOT MERGE
 2014-11-18 20:17:48 +00:00
Geoff Mendal
bf6cc2b8a3 am be2d4f99: (-s ours) am f17620e3: (-s ours) am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'be2d4f99593cf446ede31da28b3ab25a012cdf7d':
  Import translations. DO NOT MERGE
 2014-11-18 20:17:47 +00:00
Zoltan Szatmary-Ban
cfe521e6e3 Stop background processes if TrustedCredentialSettings fragment gets detached 
Otherwise getActivity() returns null and other nasty null pointer dereferencings happen.

Bug: 17976307
Change-Id: If867785f991217267e0bf0ad3058a62177509852
 2014-11-18 18:02:48 +00:00
Narayan Kamath
ad53f0b936 Use shortFormat instead of shortFormat4. 
Won't make a difference since shortFormat4 is simply shortFormat
with the 'y' characters doubled.

bug: 18388178
Change-Id: I6177807430b295035092367553da5de3b942e2d6
 2014-11-18 15:17:44 +00:00
Alexandra Gherghina
fbf9642bee am c11a94e9: am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev 
* commit 'c11a94e98a911756e645216d36dbf0a438a3fb3e':
  Fix NPE caused by status update outside activity lifecycle
 2014-11-18 10:12:49 +00:00
Alexandra Gherghina
c11a94e98a am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev 
* commit '3a84d40133e7a4f74fd1df091ba43fb85859b169':
  Fix NPE caused by status update outside activity lifecycle
 2014-11-18 10:08:49 +00:00
Alexandra Gherghina
3a84d40133 Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev 2014-11-18 10:02:37 +00:00
Sanket Padawe
1115d93887 am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit '1ec6807a11b92ceca43e09d8517641150ccb826a':
  Adding icons to sim color selection in settings UI.
 2014-11-18 02:08:01 +00:00
PauloftheWest
5f0da57c65 am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit 'a41e40ec3039f77bbe7c02714d7a2abef24c0a6d':
  Created Multi-SIM notifications.
 2014-11-18 02:06:55 +00:00
Geoff Mendal
450d9c33d0 am ab247fa4: (-s ours) am 2321682d: (-s ours) am f0450338: (-s ours) Import translations. DO NOT MERGE 
* commit 'ab247fa4a72c81138fab5e34304cfef40bc10a9f':
  Import translations. DO NOT MERGE
 2014-11-18 02:06:54 +00:00
Geoff Mendal
be2d4f9959 am f17620e3: (-s ours) am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'f17620e3d60e63425bdf3d14ce35116f6981c5b6':
  Import translations. DO NOT MERGE
 2014-11-18 02:06:53 +00:00
Sanket Padawe
1ec6807a11 am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit 'd85aa17894db4928d010c1590c2c6ea781546230':
  Adding icons to sim color selection in settings UI.
 2014-11-17 23:57:18 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
Geoff Mendal
8811741a64 am 56491f29: (-s ours) am 6c30eb97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '56491f296c17f5cd1119f743d45c4f7a49e3e4a6':
  Import translations. DO NOT MERGE
 2014-11-17 23:01:59 +00:00
PauloftheWest
a41e40ec30 am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit '79381a928b998cc45ffeeea624d8bc4b77c6529a':
  Created Multi-SIM notifications.
 2014-11-17 22:59:24 +00:00
Geoff Mendal
ab247fa4a7 am 2321682d: (-s ours) am f0450338: (-s ours) Import translations. DO NOT MERGE 
* commit '2321682d5ac67eb3d2d6cfd71ef6f4ddfd3cd9e6':
  Import translations. DO NOT MERGE
 2014-11-17 22:59:15 +00:00
Geoff Mendal
f17620e3d6 am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '383d2ab6bd9a0e3755a40a3b0b98e939cc017a6c':
  Import translations. DO NOT MERGE
 2014-11-17 22:59:04 +00:00
Geoff Mendal
56491f296c am 6c30eb97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6c30eb976a32d21cd65a0281f24544a609657594':
  Import translations. DO NOT MERGE
 2014-11-17 22:54:23 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Geoff Mendal
edd2631cd4 Merge "Import translations. DO NOT MERGE" 2014-11-17 22:27:38 +00:00
Geoff Mendal
217ffe6bf8 Import translations. DO NOT MERGE 
Change-Id: Ie927e25029960f1ed0c8858e9162f4d2f235b687
Auto-generated-cl: translation import
 2014-11-17 14:24:08 -08:00
Geoff Mendal
2321682d5a am f0450338: (-s ours) Import translations. DO NOT MERGE 
* commit 'f04503387498337787e315979dd30bfeedb88b68':
  Import translations. DO NOT MERGE
 2014-11-17 22:16:23 +00:00
Geoff Mendal
6c30eb976a Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 22:13:18 +00:00
Geoff Mendal
f045033874 Import translations. DO NOT MERGE 
Change-Id: I8742961e8d64b9b83cb3e3583c4316cd31399621
Auto-generated-cl: translation import
 2014-11-17 14:12:53 -08:00