drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,302 Commits 1 Branch 0 Tags
Commit Graph

142 Commits

Author SHA1 Message Date
Mitchell Wills
ca2227811c am 7aafd7fa: am 0b09eefa: am e69acd7a: am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit '7aafd7faacf0e31dbfc4931c137d0bad8862df87':
  Pass connection configuration when setting wifi info
 2015-08-06 03:14:08 +00:00
Mitchell Wills
0b09eefa35 am e69acd7a: am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit 'e69acd7a456fb97d7c816629dedb42026eabdd2e':
  Pass connection configuration when setting wifi info
 2015-08-06 02:45:46 +00:00
Mitchell Wills
e69acd7a45 am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit '104999b957440251610dc31939938ef0c85ab23f':
  Pass connection configuration when setting wifi info
 2015-08-06 02:37:19 +00:00
Mitchell Wills
104999b957 am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit 'd14c48444a40fa2f964461e2f1317bcc3e256295':
  Pass connection configuration when setting wifi info
 2015-08-06 02:29:19 +00:00
Mitchell Wills
5a42db2e9c Pass connection configuration when setting wifi info 
This allows the both the ssid and connection info to be verified when
updating wifi info.

Bug: 22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
 2015-08-05 15:39:19 -07:00
Xiaohui Chen
2b45f8a6ce Clean up USER_OWNER references in settingslib. 
Bug: 19913735
Change-Id: I0ccaed63c8fbc3bcbbd8d5cf8047e33c6e2edb5c
 2015-08-05 16:31:19 +00:00
Geoff Mendal
90b6961570 Import translations. DO NOT MERGE 
Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41
Auto-generated-cl: translation import
 2015-08-05 06:53:22 -07:00
Prem Kumar
fca292a7ac am 54c7ddbc: am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 
* commit '54c7ddbccd71c387c75deb36777b4aede8f226a1':
  Make default selection for contact sharing to "Checked".
 2015-08-04 01:18:12 +00:00
Prem Kumar
54c7ddbccd am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 
* commit '482ba34383796d87e4832ace98b0bb1934c8ef72':
  Make default selection for contact sharing to "Checked".
 2015-08-04 01:09:20 +00:00
Prem Kumar
482ba34383 am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 
* commit '04e2cf6bc5167583d686c2a118ec2b50a7b88547':
  Make default selection for contact sharing to "Checked".
 2015-08-04 01:00:47 +00:00
Prem Kumar
04e2cf6bc5 Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 2015-08-04 00:41:46 +00:00
Geoff Mendal
02f42ca497 Import translations. DO NOT MERGE 
Change-Id: I35c0512c48a8b1d8f4cb738a879d58421df8d747
Auto-generated-cl: translation import
 2015-08-03 06:55:08 -07:00
Geoff Mendal
f4f146723d Import translations. DO NOT MERGE 
Change-Id: I2b1557f5ff69d19dadcf7be20a4a34eb55740466
Auto-generated-cl: translation import
 2015-07-29 06:44:19 -07:00
Zach Johnson
0117bc33e2 am f8c99378: am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit 'f8c99378367ef025b9da981d62806d1d06ef299e':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 23:43:50 +00:00
Zach Johnson
f8c9937836 am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit 'bd388372a81472aa3a5f40e57f9f541f85931495':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 23:23:38 +00:00
Zach Johnson
bd388372a8 am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit '5faa033615dcb4297fcb6a81828099285364942d':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 22:58:11 +00:00
Zach Johnson
5faa033615 Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 2015-07-28 22:36:30 +00:00
Jorim Jaggi
04f61ee85d am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit 'f040100cbde4b551dd551a8b0b9eb7194116a95b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:48:37 +00:00
Jorim Jaggi
f040100cbd am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '6a601960a3cbfbed1f0ac6df65791a3149eec92e':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:35:06 +00:00
Jorim Jaggi
6a601960a3 am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '9e49b5d679672ea4a64382f9a36663c73603961b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:18:37 +00:00
Zach Johnson
b6d17ee7ae Add filter for personal apps that are not disabled until first use 
Needed for the battery settings UI.

b/22667081

Change-Id: I25ed5c1866dc3027e450c7ce9031de5def4f839a
 2015-07-24 15:48:52 -07:00
Jorim Jaggi
613f55fbbb Move PIN/Pattern appear animation to RenderThread (1/2) 
Bug: 22205322
Change-Id: I253f20a397ab89cb78254338a0254619232d7300
 2015-07-22 15:23:52 -07:00
Geoff Mendal
b568f3fdc9 Import translations. DO NOT MERGE 
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
 2015-07-22 06:49:42 -07:00
Geoff Mendal
c0fa470da0 Import translations. DO NOT MERGE 
Change-Id: Icbd56819c58f38f5e254bf06203fae83a9dddd07
Auto-generated-cl: translation import
 2015-07-20 06:52:40 -07:00
Sanket Padawe
9debd5106e Make default selection for contact sharing to "Checked". 
Bug: 22556703
Change-Id: I33343301c4097f0e966f11a8d503ca30949e9a82
 2015-07-17 12:35:58 -07:00
Geoff Mendal
a000d1fe4d Import translations. DO NOT MERGE 
Change-Id: Ie56e8483ffa87f863bb76f29f73fcdeeb7b4b2b2
Auto-generated-cl: translation import
 2015-07-15 07:05:22 -07:00
Geoff Mendal
bb24571ae8 Import translations. DO NOT MERGE 
Change-Id: I4e7c446cc9fd0a34b81173a74cddc40c22b7b74b
Auto-generated-cl: translation import
 2015-07-15 06:47:39 -07:00
Jason Monk
4345912dc8 am b9b50eff: am a7542155: am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 
* commit 'b9b50effa1ddd66c999e25af1f8bf2e2a9c07566':
  Move wifi accessibility strings to SettingsLib
 2015-07-14 20:47:46 +00:00
Jason Monk
b9b50effa1 am a7542155: am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 
* commit 'a75421557651d7016124f8ed1fa5c0bab834d121':
  Move wifi accessibility strings to SettingsLib
 2015-07-14 20:42:41 +00:00
Jason Monk
a754215576 am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 
* commit '2061049d69390a7f4ace9b37bb983ebbb4caa678':
  Move wifi accessibility strings to SettingsLib
 2015-07-14 20:30:24 +00:00
Wei Liu
650095f3c3 am 2fc9c124: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 
* commit '2fc9c1242266f02ee73e245f5ca8134781223bf6':
  Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
 2015-07-14 18:23:47 +00:00
Wei Liu
2fc9c12422 Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 2015-07-14 18:08:38 +00:00
Jason Monk
f05ca67ce4 Move wifi accessibility strings to SettingsLib 
Bug: 22468835
Change-Id: I66e85e8adfb3eda194995eda529422a172f00cbd
 2015-07-14 13:32:33 -04:00
Vinit Deshpande
266576c1a6 am 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 
* commit '7ad8e6c8499f5b5327f6b81fb34e15f5d855a641':
  Fix multiple SSIDs for same Passpoint issues
 2015-07-14 00:39:16 +00:00
Sanket Padawe
cb9d3de032 am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit 'f1a9868e18d1feb56434313701faaf52473f0942':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-14 00:20:55 +00:00
Vinit Deshpande
7ad8e6c849 am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 
* commit '3f96f8b2fff2a2a7dc0a44d5f1219da8d7f2a5c2':
  Fix multiple SSIDs for same Passpoint issues
 2015-07-13 23:36:17 +00:00
Sanket Padawe
f1a9868e18 am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit '0a66123f62f5d28bbef4f88a32c6de97caab3cfe':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-13 23:33:40 +00:00
Vinit Deshpande
3f96f8b2ff am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 
* commit '0bd08fc22ae457791d95a4d557051e6601516bd0':
  Fix multiple SSIDs for same Passpoint issues
 2015-07-13 23:02:36 +00:00
Sanket Padawe
0a66123f62 am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit '233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-13 22:30:37 +00:00
Vinit Deshpande
0bd08fc22a Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 2015-07-13 19:46:27 +00:00
Wei Liu
c4a4064c12 Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib. 
Change-Id: I1a3b245aafc5a69a13420338385c932b8fa176c1
 2015-07-13 10:55:29 -07:00
Geoff Mendal
7d54030b1c Import translations. DO NOT MERGE 
Change-Id: Idc7b4739005f2d06bf0dd38bfdb18f5c205dc5eb
Auto-generated-cl: translation import
 2015-07-11 13:12:45 -05:00
Sanket Padawe
194cce695b Changes security for Passpoint to EAP security from "Passpoint". 
Bug: 22402754
Change-Id: I3afbb6f3f446657a3e9505122032f4edc6401302
 2015-07-10 10:53:31 -07:00
Vinit Deshpande
5b7352cf1b Fix multiple SSIDs for same Passpoint issues 
This change fixes Wifi Settings UI for passpoint. The
connected notification now should show up only for the
SSIDs that match.

Bug: 22200890
Change-Id: If69a9364eca5505fe2d4037217f1777fa4d823f5
 2015-07-10 10:39:16 -07:00
Sanket Padawe
9978aef72b am fd1b5726: am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 
* commit 'fd1b57263cc07a3a77d2ee076726758bd1d97d36':
  Add Null checks while processing pairing cancel intent
 2015-07-09 01:56:03 +00:00
Sanket Padawe
fd1b57263c am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 
* commit 'af468addb672ef002dee64376bc06f2bf8c6c0f9':
  Add Null checks while processing pairing cancel intent
 2015-07-09 01:42:19 +00:00
Sanket Padawe
af468addb6 am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 
* commit '58295e71d293c131508d280f1373d94716348b2e':
  Add Null checks while processing pairing cancel intent
 2015-07-09 01:31:23 +00:00
Sanket Padawe
4d08a485db Add Null checks while processing pairing cancel intent 
Use case: Exception while handling pairing cancel
          Intent received
1. Initiate pairing from DUT to remote
2. Power off DUT after getting pairing popup

Root Cause:Crash observed in settings application

Change-Id: Ia05fe196ecf6a1d4ec26f85b0cf984e23089c728
Fix: Fixed by adding Null check in PairingCancelHandler
 2015-07-09 01:02:03 +00:00
Zoltan Szatmary-Ban
2358d5c3af am e9233f05: am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev 
* commit 'e9233f0544a1780ce43e4a01c7409cc8fadb23d7':
  Make StorageMeasurement multiprofile aware.
 2015-07-08 11:37:38 +00:00
Zoltan Szatmary-Ban
e9233f0544 am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev 
* commit 'a626f8d854d65609c71f602d79b0360359e5b5b7':
  Make StorageMeasurement multiprofile aware.
 2015-07-08 11:20:37 +00:00