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

62473 Commits

Author SHA1 Message Date
Amith Yamasani
1f26bf6bfd am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
  Different messages when wiping user and not device
 2014-11-21 23:07:03 +00:00
Amith Yamasani
108bdbc934 am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit 'efb2df698a4c2ed3d3371656cab199e5e3737fa9':
  Different messages when wiping user and not device
 2014-11-21 23:00:52 +00:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Chris Craik
90102e1009 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:21:02 +00:00
Chris Craik
1ae8a98e8a am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:13:30 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Jeff Sharkey
79ef5ef7a5 am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit '54c11274b5e7ce9f774f7c846d7165563279b96a':
  Lightweight checkin output for network stats.
 2014-11-21 22:09:28 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
Jeff Sharkey
54c11274b5 am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit 'c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4':
  Lightweight checkin output for network stats.
 2014-11-21 22:05:18 +00:00
Jeff Brown
4c9041cf83 am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '1ac13e0212a770c918d32e6c645682466113632c':
  Support keeping activities resumed while dozing.
 2014-11-21 21:59:47 +00:00
Jeff Sharkey
c0491a2e2d Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 2014-11-21 21:59:17 +00:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device 
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
 2014-11-21 13:57:48 -08:00
Jeff Brown
1ac13e0212 am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '682ed6b60807d5fa971dbd6c76deae788cb65df4':
  Support keeping activities resumed while dozing.
 2014-11-21 21:53:10 +00:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Yigit Boyar
f532871ec4 am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit '1bbaeaa4b5bab1a1eebb1e901292799c58fc5fe2':
  Improve GridLayout's weight calculations
 2014-11-21 21:00:04 +00:00
Yigit Boyar
1bbaeaa4b5 am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'ace33655bff514698b322253c211f0af5a3edd37':
  Improve GridLayout's weight calculations
 2014-11-21 20:55:19 +00:00
Alan Viverette
d7c5acdf1c am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit 'e606a7884dff4acc926cb82bf6492e83e9a1d3af':
  Fix error overwriting when restoring error
 2014-11-21 20:49:11 +00:00
Alan Viverette
47379f3050 am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit 'e442e904ae19f0b59ebfd4a7c735648b64bc955e':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:49:04 +00:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Alan Viverette
0218970afa Merge "Fix error overwriting when restoring error" 2014-11-21 20:40:30 +00:00
Alan Viverette
47172f5365 Merge "Use parseColor instead of getHTMLColor" 2014-11-21 20:40:08 +00:00
Bryce Lee
296ea91742 am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'deee5566417af229a142cf8c1964e98a356513e4':
  Make default windows features configurable.
 2014-11-21 19:27:55 +00:00
Bryce Lee
deee556641 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.
 2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00
Andreas Gampe
7d13d9db1e resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp 
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
 2014-11-21 10:36:14 -08:00
Andreas Gampe
2c596a5334 Merge "Frameworks/base: Consistency in core/jni" 2014-11-21 18:18:36 +00:00
Andreas Gampe
ed6b9dff56 Frameworks/base: Consistency in core/jni 
Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
 2014-11-21 10:15:08 -08:00
Jeff Sharkey
55a442e582 Lightweight checkin output for network stats. 
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
 2014-11-21 10:11:10 -08:00
Rubin Xu
83f2f47950 am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit '55a05e4d35c0886733586db0d5aa1af5030d35a7':
  String literals for CL ag/586597
 2014-11-21 17:59:49 +00:00
Ruben Brunk
2847eb7324 am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit 'a345b3671a8e2d1a91ccb594f219303d3e1f135f':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:55:19 +00:00
Rubin Xu
55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597
 2014-11-21 17:54:26 +00:00
Rubin Xu
b90a2f9d1a Merge "String literals for CL ag/586597" into lmp-mr1-dev 2014-11-21 17:50:23 +00:00
Ruben Brunk
a345b3671a am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit '5d3d53aa1361c094f05aa70129e49a04875ab5a6':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:49:34 +00:00
Andreas Gampe
55dbf00fd8 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" 
* commit '0da1cbaaabbe85e140dabf3fa2b289431c9d3910':
  Frameworks/base: Remove unused header
 2014-11-21 17:47:57 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Andreas Gampe
e042791e75 Merge "Frameworks/base: Remove unused header" 2014-11-21 17:38:07 +00:00
Rubin Xu
7f9e014b00 String literals for CL ag/586597 
Mini-CL to get the strings in for translations.

Bug: 17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
 2014-11-21 17:04:11 +00:00
Zoltan Szatmary-Ban
99d983b086 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
automerge: b3e8ff0

* commit 'b3e8ff00c85f37686a45597636d546a5e2a32c26':
  Adding method to query backup manager service activity status
 2014-11-21 15:26:51 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Filip Gruszczynski
5a429758e9 am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:26:31 +00:00
Filip Gruszczynski
5ea0411f39 am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit 'a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:21:19 +00:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:13:59 +00:00
Christopher Tate
5b0528b5e1 am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
  Recents backup helper
 2014-11-21 03:09:06 +00:00
Alan Viverette
ac280c48d0 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
automerge: fa4eba9

* commit 'fa4eba96374b971c13ee6427c74a78503c958757':
  Update scrollbars to match Material spec
 2014-11-21 03:03:46 +00:00
Alan Viverette
a35d07a4f0 am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 
automerge: 69b802f

* commit '69b802fdb6a5920bb0bd0270298450ede52dcaf1':
  Update overflow menu alignment to match spec
 2014-11-21 03:02:39 +00:00
Dianne Hackborn
676b1d886c am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev 
automerge: c43613b

* commit 'c43613becf0146a0d54ff15f5ca024d759c43290':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 03:01:09 +00:00
Alan Viverette
ea28d4594d am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 
automerge: 9eb4ee24

* commit '9eb4ee244beb124c0e81d73126376ec8350984c6':
  Make DeviceDefault alert dialog themes public
 2014-11-21 02:58:24 +00:00
Erik Kline
30246e3d37 am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
automerge: dedd42a

* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 02:57:09 +00:00