Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,961 Commits 3 Branches 0 Tags
dd335a119fe53eebc778cefad6ebcf321ca51701
Commit Graph

49086 Commits

Author SHA1 Message Date
Stefan Kuhne
dd335a119f am 00032442: am a3590bff: am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev 
* commit '000324423f16362cd14b805af801a4ea3dfd8cd0':
  Adding am send-trim-memory command
 2015-06-06 00:15:56 +00:00
Stefan Kuhne
000324423f am a3590bff: am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev 
* commit 'a3590bffa11dabd0721b731f53e0a1ad84caeabc':
  Adding am send-trim-memory command
 2015-06-06 00:00:06 +00:00
Stefan Kuhne
5c6c06bf18 Merge "Adding am send-trim-memory command" into mnc-dev 2015-06-05 23:37:15 +00:00
Stefan Kuhne
16045c24fe Adding am send-trim-memory command 
This patch adds a send-trim-memory command to the ActivityManager to allow
for better debugging&testing.

The command is
adb shell am send-trim-memory [--user <USER_ID>] <PROCESS> <LEVEL>
whereas LEVEL can be one of the following:
[HIDDEN|RUNNING_MODERATE|BACKGROUND|RUNNING_LOW|MODERATE|
 RUNNING_CRITICAL|COMPLETE]

Bug: 21633189
Change-Id: I7a41ce02c3c9043ffd3e5aaa791f7b7306a9de49
 2015-06-05 16:30:29 -07:00
Adam Powell
50a11e9d27 am 411b6c06: am 086f5085: am cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 
* commit '411b6c069f352853b0ca54d8b5f176299b178833':
  Use real rounding in ImageView bounds configuration
 2015-06-05 20:41:58 +00:00
Adam Powell
411b6c069f am 086f5085: am cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 
* commit '086f5085eab75d380b51cf3a286acfada7de6734':
  Use real rounding in ImageView bounds configuration
 2015-06-05 20:29:27 +00:00
Adam Powell
cedc7b3ba4 Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 2015-06-05 20:07:07 +00:00
Alan Viverette
6a521c66ab am c7ee1730: am 6e1c6b19: am a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev 
* commit 'c7ee173002c5a7950a433bd245524394ab4d5ab1':
  Avoid NPE when drawable fails to load
 2015-06-05 17:54:23 +00:00
Alan Viverette
a788ffc3fe am 8aa4d2a1: am 43b123c1: am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 
* commit '8aa4d2a19fc4aa497a6fa34c97f13376444e10ac':
  Account for margins in ScrollView onMeasure() when filling viewport
 2015-06-05 17:54:18 +00:00
Alan Viverette
c7ee173002 am 6e1c6b19: am a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev 
* commit '6e1c6b19fd92889293fa0af8f48d5d0589a0911e':
  Avoid NPE when drawable fails to load
 2015-06-05 17:42:57 +00:00
Alan Viverette
8aa4d2a19f am 43b123c1: am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 
* commit '43b123c134f7496ee83308748978e0fea2c2d4c6':
  Account for margins in ScrollView onMeasure() when filling viewport
 2015-06-05 17:42:51 +00:00
Alan Viverette
a06b41b06e Merge "Avoid NPE when drawable fails to load" into mnc-dev 2015-06-05 17:20:41 +00:00
Alan Viverette
42cc892be1 Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 2015-06-05 17:18:47 +00:00
Alan Viverette
0f1c95edf8 Avoid NPE when drawable fails to load 
Bug: 17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c
 2015-06-05 10:17:21 -07:00
Clara Bayarri
866d3c7bfb am 5d9d3281: am e3aba488: am 3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 
* commit '5d9d32816afca2976634dff0e4cdfd16f30e65b1':
  Fix Select All should not be shown when everything is already selected
 2015-06-05 16:58:12 +00:00
Clara Bayarri
5d9d32816a am e3aba488: am 3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 
* commit 'e3aba4889e34392f38ca57a6fba164cacdd4cdf3':
  Fix Select All should not be shown when everything is already selected
 2015-06-05 16:46:53 +00:00
Mady Mellor
74bf927e5f am f65aa46c: am 854a2899: am 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev 
* commit 'f65aa46c503d9f0ca837203004782aa64971bd69':
  Stylus scale - API review feedback
 2015-06-05 16:25:23 +00:00
Clara Bayarri
3e85c1ed0c Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 2015-06-05 16:19:31 +00:00
Mady Mellor
f65aa46c50 am 854a2899: am 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev 
* commit '854a2899c6a70af57d41e338e61d3e809fb98fcf':
  Stylus scale - API review feedback
 2015-06-05 16:13:50 +00:00
Adam Powell
14d1f1383f Use real rounding in ImageView bounds configuration 
While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.

Bug 20145160

Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304
 2015-06-05 08:51:45 -07:00
Mady Mellor
0f2f9f7a51 Merge "Stylus scale - API review feedback" into mnc-dev 2015-06-05 15:50:52 +00:00
Chet Haase
0490163d45 am e5b5dda1: am aa365cc5: am e790c977: Hide View.getBackgroundColor() prior to removal 
* commit 'e5b5dda19e90b81a31f0b1800e58aafb3c6665e4':
  Hide View.getBackgroundColor() prior to removal
 2015-06-05 15:18:58 +00:00
Chet Haase
e5b5dda19e am aa365cc5: am e790c977: Hide View.getBackgroundColor() prior to removal 
* commit 'aa365cc5e7b0450cc624e8fd93b6fcae594ae3a3':
  Hide View.getBackgroundColor() prior to removal
 2015-06-05 15:08:31 +00:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal 
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
 2015-06-05 14:41:51 +00:00
Zoltan Szatmary-Ban
9bef4d4a3c am 0a5bfb46: am e1a985ea: am c92550e4: Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 
* commit '0a5bfb463a1c6f7f49c99a923d152e96fe093eef':
  Replace renamed reference to NetworkStats in javadoc
 2015-06-05 10:31:01 +00:00
Zoltan Szatmary-Ban
0a5bfb463a am e1a985ea: am c92550e4: Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 
* commit 'e1a985ea469dc85f79e67f87f252509627dc14fd':
  Replace renamed reference to NetworkStats in javadoc
 2015-06-05 10:20:45 +00:00
Zoltan Szatmary-Ban
c92550e4b4 Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 2015-06-05 09:59:02 +00:00
Zhijun He
b8b01292a5 am 4a70dbbe: am adc012cf: am 16ed7e70: Merge "Camera2: fix doc build" into mnc-dev 
* commit '4a70dbbe292b558c9dc5067165c7158c6d52d1d6':
  Camera2: fix doc build
 2015-06-05 04:08:42 +00:00
Zhijun He
4a70dbbe29 am adc012cf: am 16ed7e70: Merge "Camera2: fix doc build" into mnc-dev 
* commit 'adc012cf82b8815e84d43254deccaef60feadf6f':
  Camera2: fix doc build
 2015-06-05 03:57:49 +00:00
Zhijun He
16ed7e70c8 Merge "Camera2: fix doc build" into mnc-dev 2015-06-05 03:33:59 +00:00
Johnson Hsieh
7339bbaca0 am 38e36f12: am 81188176: am 997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 
* commit '38e36f1210296bc799d3b3800f5c64691898c3da':
  Fix build: documentation error in AlarmClock.java.
 2015-06-05 03:30:36 +00:00
Zhijun He
39d1461cf1 Camera2: fix doc build 
Bug: 21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
 2015-06-04 20:21:23 -07:00
Johnson Hsieh
38e36f1210 am 81188176: am 997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 
* commit '811881763470c5406645871d657cf88e97faf552':
  Fix build: documentation error in AlarmClock.java.
 2015-06-05 03:19:11 +00:00
Johnson Hsieh
997f3ccad3 Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 2015-06-05 02:58:42 +00:00
Filip Gruszczynski
5aeeda0727 am 38b6cac4: am 0f5d0d54: am 43c4cd1c: am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '38b6cac44787bb663a4bde0932421860097b21b9':
  ActivityView: set surface on a background thread.
 2015-06-05 02:55:43 +00:00
Johnson Hsieh
bcc1ff6726 Fix build: documentation error in AlarmClock.java. 
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
 2015-06-04 19:51:52 -07:00
Filip Gruszczynski
38b6cac447 am 0f5d0d54: am 43c4cd1c: am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '0f5d0d54d452b60a039c365a1de13e1aed5426e6':
  ActivityView: set surface on a background thread.
 2015-06-05 02:43:44 +00:00
Clara Bayarri
3d5a78aa40 am acc6fc50: am fee163c5: am de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 
* commit 'acc6fc509e2f45bfbb2a9d148a7e61a378f18b3e':
  Fix Toolbar is not refreshed after Select All
 2015-06-05 02:43:30 +00:00
Clara Bayarri
acc6fc509e am fee163c5: am de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 
* commit 'fee163c5db14b9d6df65dd7b26ab4e1f02551fd3':
  Fix Toolbar is not refreshed after Select All
 2015-06-05 02:31:40 +00:00
Filip Gruszczynski
43c4cd1c82 am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '93634166c8c78bdeccf045c62a0f601dceed74e3':
  ActivityView: set surface on a background thread.
 2015-06-05 02:18:35 +00:00
Clara Bayarri
01243ac57e Fix Toolbar is not refreshed after Select All 
Bug: 21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
 2015-06-05 03:03:31 +01:00
Clara Bayarri
3b69fd81df Fix Select All should not be shown when everything is already selected 
Condition Select All on whether the full text is already selected,
and add/remove this item when needed on ActionMode invalidation.

Bug: 21608943
Change-Id: Iad5f8a77a03b98024f7dcf355b2f7f0d1338b94a
 2015-06-05 02:53:30 +01:00
Zhijun He
7d9ad7ca43 am c7023f1c: am 427a0216: am 0ccc940a: Merge "Camera2: implement high speed video APIs" into mnc-dev 
* commit 'c7023f1cf066576a2ed530436bd6b64087f9b2f5':
  Camera2: implement high speed video APIs
 2015-06-05 01:50:12 +00:00
Zhijun He
c7023f1cf0 am 427a0216: am 0ccc940a: Merge "Camera2: implement high speed video APIs" into mnc-dev 
* commit '427a0216b47276fe1891289d63a7f122c0d64dd6':
  Camera2: implement high speed video APIs
 2015-06-05 01:35:49 +00:00
Doris Liu
3dd9a25e61 am d8fa6c3a: am 6e941351: am 5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev 
* commit 'd8fa6c3aeccf8be0f54ab2a8b4778c896cbc0546':
  Make ListView's EdgeEffect respect the clipToPadding flag
 2015-06-05 01:27:32 +00:00
Clara Bayarri
b1d4d77d6a am 612e1da8: am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit '612e1da808b327aba06be883a54dc08f9afd6dd2':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:18:32 +00:00
Doris Liu
d8fa6c3aec am 6e941351: am 5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev 
* commit '6e94135180b0d21a1559e3c0f789771f152dfada':
  Make ListView's EdgeEffect respect the clipToPadding flag
 2015-06-05 01:16:09 +00:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Clara Bayarri
612e1da808 am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit 'f407aa302788c7a5a885e069fd169b6a18a9bcbb':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:06:23 +00:00
Mady Mellor
d9ff4df850 Stylus scale - API review feedback 
Fixed typo and javadoc error.

Bug: 21572278
Change-Id: Ia710971f1f4a97df7ed8e898d972f617465900b9
 2015-06-04 18:03:49 -07:00