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

199743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
8c58c3189f am fe8426a3: am 06bdab9b: Merge "Set AppErrorDialog result during dismissal if it isn\'t already set" into mnc-dev 
* commit 'fe8426a3f80ba9d238408b6d9ba30158b6c363b8':
  Set AppErrorDialog result during dismissal if it isn't already set
 2015-07-08 03:52:17 +00:00
Seigo Nonaka
3340da0e40 am ee83bc75: am 9d3cd848: Merge "Add libhidcommand_jni.so to required module." into mnc-dev 
* commit 'ee83bc75a533826c5c5ffb136cf196d5d28d6ea7':
  Add libhidcommand_jni.so to required module.
 2015-07-08 03:52:13 +00:00
David Friedman
9024e0efe8 Docs: L10N of remaining M-Preview docs (zh-tw) 
Change-Id: Iaacf6f14f5b2be933102d7aa36d57a0050a4d147
 2015-07-07 20:52:05 -07:00
David Friedman
ebfe2be18a am 3f83aa3f: am 4da25c2e: Docs: L10N of remaining M Preview docs (ko). 
* commit '3f83aa3f7b6a96619b5bdd31a30d8b7937e0894f':
  Docs: L10N of remaining M Preview docs (ko).
 2015-07-08 03:43:58 +00:00
Wale Ogunwale
fe8426a3f8 am 06bdab9b: Merge "Set AppErrorDialog result during dismissal if it isn\'t already set" into mnc-dev 
* commit '06bdab9b9084472c7918ddc63c5141ccf6293e86':
  Set AppErrorDialog result during dismissal if it isn't already set
 2015-07-08 03:43:44 +00:00
David Friedman
4e1d42f9ea Merge "Docs: L10N of remaining M Preview pages for zh-cn" into mnc-preview-docs 2015-07-08 03:40:05 +00:00
Seigo Nonaka
ee83bc75a5 am 9d3cd848: Merge "Add libhidcommand_jni.so to required module." into mnc-dev 
* commit '9d3cd8484e9ec70aef2ca8d4d33ea2943c7b67ea':
  Add libhidcommand_jni.so to required module.
 2015-07-08 03:37:05 +00:00
Wale Ogunwale
06bdab9b90 Merge "Set AppErrorDialog result during dismissal if it isn't already set" into mnc-dev 2015-07-08 03:32:33 +00:00
David Friedman
3f83aa3f7b am 4da25c2e: Docs: L10N of remaining M Preview docs (ko). 
* commit '4da25c2e040f58ae8fc3361a5e0f974ab528e44e':
  Docs: L10N of remaining M Preview docs (ko).
 2015-07-08 03:31:15 +00:00
Seigo Nonaka
9d3cd8484e Merge "Add libhidcommand_jni.so to required module." into mnc-dev 2015-07-08 03:25:33 +00:00
David Friedman
4da25c2e04 Docs: L10N of remaining M Preview docs (ko). 
Change-Id: I56baa833adc527e4ca624034d613811172f14f91
 2015-07-07 20:12:04 -07:00
David Friedman
2f47c23925 Docs: L10N of remaining M Preview pages for zh-cn 
Change-Id: Id28c630d362b9a59da1ef06c82449008755a1bf0
 2015-07-07 20:11:08 -07:00
Geoff Mendal
40bcebcffb am c7b893de: (-s ours) am 12b2abe2: (-s ours) am 9a8db293: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c7b893de5a5402a54e1a207c62b4ea09584dc30e':
  Import translations. DO NOT MERGE
 2015-07-08 02:46:11 +00:00
Chris Craik
0c218e43b8 am 9ca926ad: am fdb87b76: am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev 
* commit '9ca926adbb5c3503300bdd52266daf503e14113a':
  Remove all usage of fmin and fmax
 2015-07-08 02:46:05 +00:00
Geoff Mendal
c7b893de5a am 12b2abe2: (-s ours) am 9a8db293: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '12b2abe21daf5b7fb78414dd5d884bd2f723b46b':
  Import translations. DO NOT MERGE
 2015-07-08 02:28:21 +00:00
Chris Craik
9ca926adbb am fdb87b76: am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev 
* commit 'fdb87b76733442c7cf36719748966a38a80671a7':
  Remove all usage of fmin and fmax
 2015-07-08 02:28:17 +00:00
Geoff Mendal
12b2abe21d am 9a8db293: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '9a8db29397694d139905e690346f56711a16dce9':
  Import translations. DO NOT MERGE
 2015-07-08 02:09:36 +00:00
Chris Craik
fdb87b7673 am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev 
* commit '127b478ac61eed99894998b38bca82b79b8e56b1':
  Remove all usage of fmin and fmax
 2015-07-08 02:09:32 +00:00
David Friedman
817820cb48 am 72b2a1cd: am b517be4c: am 5544cb42: am 6fa1ee64: am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs 
* commit '72b2a1cdc5f0a7e9279dd18b3acb0a3a992d5d70':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
 2015-07-08 02:00:17 +00:00
Selim Cinek
ae77f8e658 Fixed a bug where collapserunnables where dropped 
When a runnable was added while iterating over it,
it was cleared right after.

Bug: 22260165
Change-Id: I2faf9af61c08853eb8364d49ccd36d686a4b3bf8
 2015-07-07 18:59:56 -07:00
Geoff Mendal
9a8db29397 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 01:58:00 +00:00
Geoff Mendal
813b167cd6 Import translations. DO NOT MERGE 
Change-Id: Id6958aa309a3c3c778070b94c9d8f969da04124c
Auto-generated-cl: translation import
 2015-07-07 18:56:12 -07:00
Chris Craik
127b478ac6 Merge "Remove all usage of fmin and fmax" into mnc-dev 2015-07-08 01:53:57 +00:00
Dianne Hackborn
f368f6b978 am 6ee8a509: am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit '6ee8a509833258b962d86985f86437f44dfcd0d7':
  Add new "preinstalled" permission flag.
 2015-07-08 01:44:12 +00:00
David Friedman
1c4338d0a5 am e756ac35: am 51fed06f: am 05ca442f: am 3d0d02e6: am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs 
* commit 'e756ac353a262431cb3b80e084fca86c76a5098b':
  docs: Preview 2 - Update downloads page
 2015-07-08 01:44:07 +00:00
David Friedman
72b2a1cdc5 am b517be4c: am 5544cb42: am 6fa1ee64: am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs 
* commit 'b517be4c8716725cf2e5e37e9497dad5423fa459':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
 2015-07-08 01:43:58 +00:00
Chris Craik
e6a15ee3d0 Remove all usage of fmin and fmax 
bug:22208220

Removes needless call, and upconversion to doubles in multiple places.

Change-Id: I1b949fa5f206446ac34de800154c0147d6bd8034
 2015-07-07 18:42:42 -07:00
Dianne Hackborn
6ee8a50983 am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit 'c55c4a289c6f2ee5c1436af274b9e5eeaf1566f8':
  Add new "preinstalled" permission flag.
 2015-07-08 01:30:01 +00:00
David Friedman
e756ac353a am 51fed06f: am 05ca442f: am 3d0d02e6: am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs 
* commit '51fed06f0ca2d7b3adf9a836337be31f5812f0b3':
  docs: Preview 2 - Update downloads page
 2015-07-08 01:29:57 +00:00
David Friedman
b517be4c87 am 5544cb42: am 6fa1ee64: am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs 
* commit '5544cb421c38d2f0a966a69d112ca7685aa716f7':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
 2015-07-08 01:27:26 +00:00
Ian Pedowitz
2411b84128 am c00a9f41: am 506b9dd0: am 2020178f: Merge "Revert "Set default SMS application to Messenger"" into mnc-dev 
* commit 'c00a9f418a4d9244b61364cd471dd9f25eab637e':
  Revert "Set default SMS application to Messenger"
 2015-07-08 01:18:31 +00:00
Vineeta Srivastava
4b4c02d126 am bfc7926f: am 1a0c150d: am 578eef70: Merge "Enforce camera shutter sound for India" into mnc-dev 
* commit 'bfc7926f162c073bf800465a5f4e370a0e191ec3':
  Enforce camera shutter sound for India
 2015-07-08 01:18:25 +00:00
David Friedman
5544cb421c am 6fa1ee64: am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs 
* commit '6fa1ee64fcd783294afa6ca99109b6351da7b6a1':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
 2015-07-08 01:17:41 +00:00
Ian Pedowitz
c00a9f418a am 506b9dd0: am 2020178f: Merge "Revert "Set default SMS application to Messenger"" into mnc-dev 
* commit '506b9dd0137278c22c6a8ace1d9c29e5dedc089e':
  Revert "Set default SMS application to Messenger"
 2015-07-08 01:09:49 +00:00
Dianne Hackborn
c55c4a289c am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit 'b14dc048ec8323e4a10bbfe42129bb91616470b8':
  Add new "preinstalled" permission flag.
 2015-07-08 01:08:05 +00:00
David Friedman
51fed06f0c am 05ca442f: am 3d0d02e6: am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs 
* commit '05ca442ff40bd958b33079447d77892e1a6dc979':
  docs: Preview 2 - Update downloads page
 2015-07-08 01:08:01 +00:00
Dianne Hackborn
b14dc048ec Merge "Add new "preinstalled" permission flag." into mnc-dev 2015-07-08 01:03:46 +00:00
David Friedman
6fa1ee64fc am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs 
* commit '41a722ab49e8b6dfed1de317e58867afd5bb5077':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
 2015-07-08 01:00:38 +00:00
Vineeta Srivastava
bfc7926f16 am 1a0c150d: am 578eef70: Merge "Enforce camera shutter sound for India" into mnc-dev 
* commit '1a0c150dfebe49373202f6be6eaf09824e255a22':
  Enforce camera shutter sound for India
 2015-07-08 01:00:22 +00:00
Ian Pedowitz
506b9dd013 am 2020178f: Merge "Revert "Set default SMS application to Messenger"" into mnc-dev 
* commit '2020178f97c5826fdba773e83b397f11950a0249':
  Revert "Set default SMS application to Messenger"
 2015-07-08 00:59:33 +00:00
David Friedman
05ca442ff4 am 3d0d02e6: am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs 
* commit '3d0d02e66864db3085fba75777f675d5e5cae200':
  docs: Preview 2 - Update downloads page
 2015-07-08 00:56:53 +00:00
Wei Liu
26125e28b1 am 38e932b3: Move NetworkPolicyEditor from Settings packge to settingslib. 
* commit '38e932b37aea8d2f6866c3c879afa188587bcde3':
  Move NetworkPolicyEditor from Settings packge to settingslib.
 2015-07-08 00:51:19 +00:00
David Friedman
41a722ab49 Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs 2015-07-08 00:49:12 +00:00
Ian Pedowitz
2020178f97 Merge "Revert "Set default SMS application to Messenger"" into mnc-dev 2015-07-08 00:47:27 +00:00
Ian Pedowitz
64b756f121 Revert "Set default SMS application to Messenger" 
This reverts commit a21d249e45abf99c2f4acbbb47bf00e9803db1aa.

Bug: 22261909
Change-Id: I064b8fe98eeec96a534c0f2ea3ec63057a5a1a1d
 2015-07-08 00:46:54 +00:00
Jeff Sharkey
5af1835d67 Generate stable MTP storage IDs. 
It ends up that MediaProvider is persisting MTP storage IDs in its
database, so we need to make sure we generate stable IDs over time,
otherwise we can end up looking into a black hole.

Bug: 22256092
Change-Id: I6a75c239aac1b71fd5f6df0df69b24971079a086
 2015-07-07 17:46:16 -07:00
David Friedman
3d0d02e668 am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs 
* commit 'dafcaf72c6479af0efc4b7194e07a05039b66942':
  docs: Preview 2 - Update downloads page
 2015-07-08 00:44:37 +00:00
Vineeta Srivastava
1a0c150dfe am 578eef70: Merge "Enforce camera shutter sound for India" into mnc-dev 
* commit '578eef7001f1f70db8fecf24330ab7eb9a05a53a':
  Enforce camera shutter sound for India
 2015-07-08 00:41:38 +00:00
David Friedman
e631d564e0 Docs: L10N of remaining M-Preview pages (Ja) 
Bug: 21789313

Change-Id: I1e70749c29dc24d7242bf78da76136f184649626
 2015-07-07 17:35:45 -07:00
David Friedman
dafcaf72c6 Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs 2015-07-08 00:31:57 +00:00