Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,429 Commits 1 Branch 0 Tags
b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e
Commit Graph

15429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fyodor Kupolov
b26bec1a6f am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1 
* commit '83930bc3ee26001e18a3f708e05c0e967e21e559':
 2015-01-29 20:39:11 +00:00
Fyodor Kupolov
83930bc3ee am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 
automerge: 5b2b7e1

* commit '5b2b7e189766e889118059902a15a4ce2c127e9d':
 2015-01-29 20:34:29 +00:00
Fyodor Kupolov
5b2b7e1897 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started 
automerge: 3a3ff59

* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
 2015-01-29 19:39:59 +00:00
Fyodor Kupolov
f400051c3a am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae 
* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
 2015-01-29 19:35:11 +00:00
Fyodor Kupolov
9e432a698b am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 
automerge: 0738bae

* commit '0738bae9164b150ce81b8cba57be9105a0308115':
 2015-01-29 19:29:20 +00:00
Fyodor Kupolov
6355e1152a am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started 
* commit '77a2e3d62574be9cf0aae17231fd423a7a399984':
  Added a check if a custom activity can be started
 2015-01-29 19:09:23 +00:00
Fyodor Kupolov
77a2e3d625 am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started 
* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
 2015-01-29 19:03:01 +00:00
Fyodor Kupolov
3a3ff59197 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started 
* commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
  Added a check if a custom activity can be started
 2015-01-29 18:57:22 +00:00
Fyodor Kupolov
a6c8a0e66d am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started 
* commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
  Added a check if a custom activity can be started
 2015-01-29 18:50:43 +00:00
Fyodor Kupolov
d8b606b81a am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started 
* commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
  Added a check if a custom activity can be started
 2015-01-29 18:45:51 +00:00
Fyodor Kupolov
bd89b7b45e am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started 
* commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
  Added a check if a custom activity can be started
 2015-01-29 18:19:06 +00:00
Fyodor Kupolov
0738bae916 am d7e93570: am f11f9f47: Added a check if a custom activity can be started 
automerge: 57641a8

* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
 2015-01-29 18:12:42 +00:00
Fyodor Kupolov
2f3bc3cb3f am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started 
* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
  Added a check if a custom activity can be started
 2015-01-29 18:12:04 +00:00
Fyodor Kupolov
0d5ad3b73e am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started 
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
 2015-01-29 18:09:29 +00:00
Fyodor Kupolov
57641a8b50 am d7e93570: am f11f9f47: Added a check if a custom activity can be started 
* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
  Added a check if a custom activity can be started
 2015-01-29 18:02:40 +00:00
Fyodor Kupolov
e3904c4f09 am e8e7b9b3: Added a check if a custom activity can be started 
* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
  Added a check if a custom activity can be started
 2015-01-29 18:01:00 +00:00
Fyodor Kupolov
d7e93570d3 am f11f9f47: Added a check if a custom activity can be started 
* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
  Added a check if a custom activity can be started
 2015-01-29 17:55:47 +00:00
Fyodor Kupolov
f11f9f47d3 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
(cherry picked from commit 07ab95c43e)
 2015-01-28 10:31:36 +00:00
Fyodor Kupolov
e8e7b9b381 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
 2015-01-28 05:23:07 -05: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
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
Geoff Mendal
f045033874 Import translations. DO NOT MERGE 
Change-Id: I8742961e8d64b9b83cb3e3583c4316cd31399621
Auto-generated-cl: translation import
 2014-11-17 14:12:53 -08:00
Geoff Mendal
827ad0c38c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:30:10 +00:00
Geoff Mendal
c9e7209ca8 Import translations. DO NOT MERGE 
Change-Id: I99007a120d90a442a65f31ab35b8da3d1aa8524e
Auto-generated-cl: translation import
 2014-11-12 14:48:49 -08:00
Geoff Mendal
9ae3bf2d3f Import translations. DO NOT MERGE 
Change-Id: I8170fefa7733e2feddad643069cc0407631a2b96
Auto-generated-cl: translation import
 2014-11-12 12:07:20 -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
Baligh Uddin
960c98f91d Import translations. DO NOT MERGE 
Change-Id: I18ddc7f1f2104dad793af6e7a8978b0d36758258
Auto-generated-cl: translation import
 2014-11-06 09:49:04 -08:00
Geoff Mendal
f6b609872c Import translations. DO NOT MERGE 
Change-Id: Ia602c0a9ac55f054d0c01cc742d085da1fcef19e
Auto-generated-cl: translation import
 2014-11-03 10:07:02 -08:00
Geoff Mendal
4c79a9ecc0 Import translations. DO NOT MERGE 
Change-Id: I61c6746c6591894d13cf5ee2f3fd70ab4fc2762e
Auto-generated-cl: translation import
 2014-10-29 13:38:11 -07:00
Geoff Mendal
c7df50c5fd Import translations. DO NOT MERGE 
Change-Id: Id43df7ce7c8056dcdd1813ddc804acbc3ba46dd6
Auto-generated-cl: translation import
 2014-10-27 09:49:35 -07:00
Michael Wright
95f29a1930 Skip Misc/Overcounted battery stats in release builds. 
automerge: f7a5017

* commit 'f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-24 22:04:21 +00:00
Michael Wright
f7a5017fa6 Skip Misc/Overcounted battery stats in release builds. 
Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
 2014-10-24 14:25:49 -07:00
Sanket Padawe
5fd97c551f Merge "WIP support icon" into lmp-sprout-dev 2014-10-24 17:34:24 +00:00
Sanket Padawe
0f596b90fe WIP support icon 
Added static sim icon to alert box for selecting different sim accounts.

Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
 2014-10-24 10:17:08 -07:00
Baligh Uddin
cc5b08b63c am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE 
* commit '8d7fdc618a914d6c35f1033dafac5ab3cf0c930e':
  Import translations. DO NOT MERGE
 2014-10-23 21:52:59 +00:00
Baligh Uddin
8d7fdc618a Import translations. DO NOT MERGE 
Change-Id: I9e17d1cbaab06ef2e48001b946476e99d70ba195
Auto-generated-cl: translation import
 2014-10-23 14:37:38 -07:00
Amith Yamasani
526e4b4155 am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev 
* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
  Disable factory reset for secondary users
 2014-10-23 00:02:44 +00:00
Amith Yamasani
c1dc875224 Merge "Disable factory reset for secondary users" into lmp-dev 2014-10-22 23:59:19 +00:00
Geoff Mendal
5b7e25aa7c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-22 23:57:24 +00:00
Geoff Mendal
82454b4721 Import translations. DO NOT MERGE 
Change-Id: I895931be5f341683d3bed7a087b3b1c4dc5a0359
Auto-generated-cl: translation import
 2014-10-22 16:29:28 -07:00
Amith Yamasani
4339a470d3 Disable factory reset for secondary users 
Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.

Bug: 18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9
 2014-10-22 13:51:53 -07:00
Sanket Padawe
59dc8d1db4 SIM settings display name changes 
Resubmitting the change for displaying SIM name in SIM settings.

Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8
 2014-10-22 11:36:08 -07:00
Paul Jensen
a1640daf62 am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit 'd9b8d1803aac44f382e330ea62bc936e049a1aed':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 17:26:58 +00:00
Paul Jensen
d9b8d1803a Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 2014-10-22 17:17:00 +00:00
Sanket Padawe
266e429657 Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 2014-10-21 21:56:06 +00:00
Sanket Padawe
a501137f26 Commit with dialog box but using subinfo records 
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
 2014-10-21 14:16:12 -07:00
Geoff Mendal
eda5136ba2 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:57:55 +00:00
Geoff Mendal
d335d4f395 Import translations. DO NOT MERGE 
Change-Id: Ib689764b81b797eb3dee6a1bd786ef911926adbd
Auto-generated-cl: translation import
 2014-10-20 16:52:16 -07:00
Geoff Mendal
6acdd044d7 am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit '795c83780752d0301985d53e2e230c2088af825b':
  Import translations. DO NOT MERGE
 2014-10-20 23:41:26 +00:00
Geoff Mendal
795c837807 Import translations. DO NOT MERGE 
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
 2014-10-20 16:33:09 -07:00