Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,700 Commits 3 Branches 0 Tags
efe36a11e17260a0c19b7188ca3e3f00b297ae6b
Commit Graph

54451 Commits

Author SHA1 Message Date
Jeff Sharkey
0e5e4eea5e am 4edfd64b: am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev 
* commit '4edfd64bc1c69be3107fe924772331c1a974e28c':
  Forget private partition keys.
 2015-06-22 21:57:08 +00:00
Alan Viverette
8adf480f06 am 7f6da50d: am 823f51f3: am 696d2149: Merge "Match default color packing for captioning settings" into mnc-dev 
* commit '7f6da50d438753c57b6a408e59868fad3a4a89e1':
  Match default color packing for captioning settings
 2015-06-22 21:56:51 +00:00
Jeff Sharkey
4edfd64bc1 am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev 
* commit '421daf8590cdbce7e41b7492608a985fe13c2033':
  Forget private partition keys.
 2015-06-22 21:33:44 +00:00
Alan Viverette
7f6da50d43 am 823f51f3: am 696d2149: Merge "Match default color packing for captioning settings" into mnc-dev 
* commit '823f51f3a2dcba1a0d509eab66b7ba330fddecea':
  Match default color packing for captioning settings
 2015-06-22 21:13:38 +00:00
Jeff Sharkey
c629271d48 Merge "Forget private partition keys." into mnc-dev 2015-06-22 21:09:52 +00:00
Jeff Sharkey
5cc0df214b Forget private partition keys. 
When we forget a private partition, ask vold to also forget the key
for that partition GUID.  This means we need to track both the
filesystem UUID and the partition GUID for a private volume.

Bug: 21782268
Change-Id: Icda1cbb65539d61dacc663428daf3d1a2e4c313e
 2015-06-22 14:07:10 -07:00
Alan Viverette
696d214946 Merge "Match default color packing for captioning settings" into mnc-dev 2015-06-22 20:55:12 +00:00
Jason Monk
19998a847c am 32621bea: am bfaff994: am 6283a125: Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 
* commit '32621bea2e4ed27b4737602f06620ec8efbcb084':
  ButtonBarLayout: Let allowStacking to be set through code
 2015-06-22 20:27:35 +00:00
Jason Monk
32621bea2e am bfaff994: am 6283a125: Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 
* commit 'bfaff994af8053f562046c4e07e5c88d0538d250':
  ButtonBarLayout: Let allowStacking to be set through code
 2015-06-22 20:15:08 +00:00
Alan Viverette
7e4019b741 Match default color packing for captioning settings 
"Default" packed colors are indicated by zero alpha and non-zero
red/blue. The cached alpha value used by Settings is stored in green.

Bug: 21602597
Change-Id: I1465210fda854ee979aa3a6b398ae60b41d10711
 2015-06-22 13:06:24 -07:00
Jeff Brown
e689cca19c am 3a9f86a2: am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '3a9f86a2df00973b10754fa4011b8e8c32928685':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 20:01:41 +00:00
Jason Monk
6283a12579 Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 2015-06-22 19:53:01 +00:00
Jeff Brown
3a9f86a2df am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '6903187a2f3b54ce40239071d6f3a8bafd396ea9':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 19:51:11 +00:00
Jeff Brown
d63c721e71 Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 2015-06-22 19:29:32 +00:00
Jason Monk
5658328d8d ButtonBarLayout: Let allowStacking to be set through code 
Bug: 21997648
Change-Id: I7ac38d39b4aa282f59b7d13f21d06c7c465ebb20
 2015-06-22 14:47:00 -04:00
Yohei Yukawa
c0f1ad2c3e am b00c10eb: am 2e24241e: am 648abe15: Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 
* commit 'b00c10eb29e8db7272c1077649a72389dfed89eb':
  Set DISABLED_UNTIL_USED for the correct user in IMMS.
 2015-06-22 18:28:27 +00:00
Selim Gurun
885e30fd83 am e0d181e3: am ac7b7015: am 7c781124: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'e0d181e33175eed361c3fef3552d3c861b4da3eb':
  Clarify handling client certificates
 2015-06-22 18:28:21 +00:00
Yohei Yukawa
b00c10eb29 am 2e24241e: am 648abe15: Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 
* commit '2e24241ead47aec74df5cbb3ddc5b0d0ed797c0f':
  Set DISABLED_UNTIL_USED for the correct user in IMMS.
 2015-06-22 18:19:58 +00:00
Selim Gurun
e0d181e331 am ac7b7015: am 7c781124: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'ac7b7015e062dc410f59ed5e6bce6c38fcaeeb95':
  Clarify handling client certificates
 2015-06-22 18:19:53 +00:00
Kenny Guy
bf190b2ebb am 38914619: am 32327b72: am 43423549: Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 
* commit '389146190e1d391a91871f07518be755d01d31de':
  Fix LauncherApps registerCallback adding duplicate callbacks.
 2015-06-22 18:13:52 +00:00
Julia Reynolds
762bee92f6 am 8ce3cd35: am 6286a6a8: am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit '8ce3cd3562f4d3f8d4484228a7d53de2d51687bf':
  Hide device initializer methods/fields.
 2015-06-22 18:13:46 +00:00
Yohei Yukawa
648abe1565 Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 2015-06-22 17:59:42 +00:00
Selim Gurun
7c78112476 Merge "Clarify handling client certificates" into mnc-dev 2015-06-22 17:55:29 +00:00
Kenny Guy
389146190e am 32327b72: am 43423549: Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 
* commit '32327b7256cf4ab321ee9906837fb25dd1d39ab4':
  Fix LauncherApps registerCallback adding duplicate callbacks.
 2015-06-22 17:08:16 +00:00
Julia Reynolds
8ce3cd3562 am 6286a6a8: am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit '6286a6a85bc7a8d959d640191b098c723a427bcd':
  Hide device initializer methods/fields.
 2015-06-22 17:08:12 +00:00
Selim Gurun
a679ac59a1 Clarify handling client certificates 
Bug: 21910771

Clarify handling client certificates when using a webview. This is a
documentation change only.

Change-Id: Ida78bd89aa8867c99b4b9e4433e342767e9bac0d
 2015-06-22 10:04:01 -07:00
Kenny Guy
434235496c Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 2015-06-22 16:50:05 +00:00
Julia Reynolds
d66559f26d Merge "Hide device initializer methods/fields." into mnc-dev 2015-06-22 16:41:42 +00:00
Derek Sollenberger
82064fcab4 am 87c5a508: am f1c031d5: am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 
* commit '87c5a5088e555fb3bbd5f28f1eb85a0596d36250':
  Enable Picture w/ HW Accelerated Canvas.
 2015-06-22 16:07:14 +00:00
Derek Sollenberger
87c5a5088e am f1c031d5: am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 
* commit 'f1c031d512fd8596e40b8a5832441869ab831e48':
  Enable Picture w/ HW Accelerated Canvas.
 2015-06-22 15:59:37 +00:00
Derek Sollenberger
b2aea9dcbd Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 2015-06-22 15:38:11 +00:00
Andrei Stingaceanu
ec9e10b74d am 4ca5725f: am 76d2204d: am b1891b3f: Fix selection by double tap in Extracted mode 
* commit '4ca5725f95e613a9550f77e4ec155432141a8095':
  Fix selection by double tap in Extracted mode
 2015-06-22 13:36:36 +00:00
Andrei Stingaceanu
4ca5725f95 am 76d2204d: am b1891b3f: Fix selection by double tap in Extracted mode 
* commit '76d2204d2b4d42f11222eb68f0058b6c3bae6e10':
  Fix selection by double tap in Extracted mode
 2015-06-22 13:24:22 +00:00
Derek Sollenberger
e109940d81 Enable Picture w/ HW Accelerated Canvas. 
Bug: 20688645
Change-Id: I664f37d6dbb3e61b17206c82ebcc63f988cefc65
 2015-06-22 13:18:29 +00:00
Andrei Stingaceanu
b1891b3fc9 Fix selection by double tap in Extracted mode 
Select with double tap in extracted mode has suffered
a regression recently: flickers and it does not correctly
select. Found this fix after a lot of trials.

Bug: 20128047
Change-Id: I1bbe8c11982d37e5409bac2b648a31b0ca1f0bbc
 2015-06-22 12:42:06 +01:00
Vladislav Kaznacheev
0796f25c0a am 86578bee: am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 
* commit '86578bee880d33ac40bb002ffc717e471acda754':
  Fix huge bounce-back in ListView when double-flinging
 2015-06-22 09:59:01 +00:00
Vladislav Kaznacheev
86578bee88 am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 
* commit '01acdd9feaa1dfe32863b667dd9300240bbc3db7':
  Fix huge bounce-back in ListView when double-flinging
 2015-06-22 09:46:30 +00:00
Vladislav Kaznacheev
8228e4247c Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 2015-06-22 09:30:20 +00:00
Yohei Yukawa
094c71fd5c Set DISABLED_UNTIL_USED for the correct user in IMMS. 
This CL makes If8ff1b2b95c36d33148def2ab87bd006aa520cc0
multi-user aware.

It turns out that DISABLED_UNTIL_USED has not been correctly
set to IMEs seen from secondary users because we have used
  IMMS#mContext.getPackageManager(),
which always returns the PackageManager with the primary
users' context, when specifying
COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED.

We should use IPackageManager instead as we have already done
in many places of IMMS since Ib23849d352db33f0747aa9d5a178f00.

Bug: 8148605
Bug: 8365223
Bug: 21953608
Change-Id: I4b9d6510bf965204bb1f68c8b527d1a4df23fac4
 2015-06-20 00:41:31 -07:00
Bart Sears
2f97ec825f am 48f94aac: am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev 
* commit '48f94aac65e09504f85b2cd12492145e266b488c':
  Revert "Clarify handling client certificates"
 2015-06-20 05:59:09 +00:00
Bart Sears
48f94aac65 am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev 
* commit '1b96f013a02409195278be23a19d57289f26c7fe':
  Revert "Clarify handling client certificates"
 2015-06-20 05:46:13 +00:00
Paul Jensen
6e940c659c am 2e2cc43e: am ae6d0354: am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 
* commit '2e2cc43e3353ca433fc7f85521102cb138faeb65':
  Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
 2015-06-20 05:43:50 +00:00
Adam Powell
40a7c2d85e am af49d7db: am 96b879c7: am b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev 
* commit 'af49d7db968d188ff132ff1cf8bf59ba09602819':
  Fix regression in viewing app info from ChooserActivity targets
 2015-06-20 05:43:33 +00:00
Bart Sears
950aa197d4 Merge "Revert "Clarify handling client certificates"" into mnc-dev 2015-06-20 05:22:39 +00:00
Bart Sears
4ead33300f Revert "Clarify handling client certificates" 
CL broke the javadoc build.

This reverts commit 36cf701e1e.

Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
 2015-06-20 05:21:38 +00:00
Paul Jensen
2e2cc43e33 am ae6d0354: am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 
* commit 'ae6d0354677221fb988a76f2f26c064c167283da':
  Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
 2015-06-20 01:33:24 +00:00
Paul Jensen
2f56a33041 Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 2015-06-20 01:13:18 +00:00
Adam Powell
af49d7db96 am 96b879c7: am b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev 
* commit '96b879c791551b79b6acc703e2a9b80d453bea49':
  Fix regression in viewing app info from ChooserActivity targets
 2015-06-20 01:07:57 +00:00
Doris Liu
11f80da4a0 am ec92ea39: am 5bfdb772: am 4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev 
* commit 'ec92ea3946311e177d5eeb14a5c6f885ca5311de':
  Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
 2015-06-20 01:00:39 +00:00
Doris Liu
ec92ea3946 am 5bfdb772: am 4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev 
* commit '5bfdb772f68256480fbcbb5161bb079b60f2d8bf':
  Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
 2015-06-20 00:47:12 +00:00