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

174391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
8c359de059 am 8ee7fcd2: am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev automerge: 4247f06 
* commit '8ee7fcd28bf54a4cc3d89a08bf48508d9a82cc58':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:19:17 +00:00
Alan Viverette
51c1803c2b am ee53586a: am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev automerge: 6a6b828 
* commit 'ee53586acb0e4b64d25313ccbab7e9310cdd9e2c':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:19:12 +00:00
Alan Viverette
e77158de03 am 499ea6b6: am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev automerge: 21aaf98 
* commit '499ea6b6d67609624d85d8ffe2df2f5d435ab895':
  Fix several small layout and color issues
 2014-11-20 21:13:34 +00:00
xinhe
1886e5e01f am e013f5ea: (-s ours) am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev automerge: 29b90ae -s ours 
* commit 'e013f5eace84c3847a89fbbb1869a9d0d54b6f7e':
  Add configuration to control converting sms destination number
 2014-11-20 21:13:30 +00:00
Alan Viverette
8ee7fcd28b am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
automerge: 4247f06

* commit '4247f06ba43becfcdf7713b4b9fbc347c5b3361d':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:10:56 +00:00
Alan Viverette
ee53586acb am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
automerge: 6a6b828

* commit '6a6b828090de26aeef7d11a7cc0513a813cbf3a9':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:09:34 +00:00
Alan Viverette
499ea6b6d6 am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev 
automerge: 21aaf98

* commit '21aaf98f6fc666dcd2dad43c368038d441fefbb2':
  Fix several small layout and color issues
 2014-11-20 21:08:32 +00:00
John Spurlock
00c9de816a am 4adb8d49: am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev automerge: 61f4f68 
* commit '4adb8d496d14cdad83eed0a6972eade7979250ff':
  BatterySaver: Update disclosure string.
 2014-11-20 21:07:46 +00:00
Mathieu Chartier
0b9ccc328c am fff5e0a0: am 7fc9176c: Add zygote space to Dalvik Heap automerge: 78f235d 
* commit 'fff5e0a051d880aef24256441ab1c9663f3bb485':
  Add zygote space to Dalvik Heap
 2014-11-20 21:07:42 +00:00
Jason Monk
9c6e3c67b6 am 16b03c9a: am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev automerge: bdf37b7 
* commit '16b03c9a73aebd71d66ae379348eca81be676ef5':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:07:37 +00:00
xinhe
e013f5eace am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev 
automerge: 29b90ae  -s ours

* commit '29b90ae5fdca54e5438a192fa810e0e35983b1e0':
  Add configuration to control converting sms destination number
 2014-11-20 21:07:07 +00:00
John Spurlock
4adb8d496d am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 
automerge: 61f4f68

* commit '61f4f685719b14f14479ebb6e7234ad30d320a7a':
  BatterySaver: Update disclosure string.
 2014-11-20 21:03:54 +00:00
Mathieu Chartier
fff5e0a051 am 7fc9176c: Add zygote space to Dalvik Heap 
automerge: 78f235d

* commit '78f235db2dcd09ace3efe785af0ee0bf88bb99a8':
  Add zygote space to Dalvik Heap
 2014-11-20 21:02:47 +00:00
Jason Monk
16b03c9a73 am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
automerge: bdf37b7

* commit 'bdf37b714d4c3e3fb0ac27c625fdcffbd616b4f9':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:00:19 +00:00
Narayan Kamath
b951370724 am 0d22608c: resolved conflicts for merge of bcb86374 to lmp-mr1-dev-plus-aosp 
* commit '0d22608cf3cedc6e83b90b571b1042a0a714c983':
  Tell installd when boot completes.
 2014-11-20 11:04:24 +00:00
Narayan Kamath
0d22608cf3 resolved conflicts for merge of bcb86374 to lmp-mr1-dev-plus-aosp 
Change-Id: I68bd16ed55f9e3794049051184f82503f679667c
 2014-11-20 10:59:07 +00:00
Narayan Kamath
bcb86374dc am 9f285bd6: Merge "Tell installd when boot completes." 
* commit '9f285bd60b219b562bc55c7c2a9fae23eae554e5':
  Tell installd when boot completes.
 2014-11-20 10:51:26 +00:00
Narayan Kamath
9f285bd60b Merge "Tell installd when boot completes." 2014-11-20 10:47:17 +00:00
Riley Andrews
6d354163ca [wip] Make the window animator rely on frameTime. 
The window animator is looking at cpu time difference
whilst updating animations. Using the choreographer display frame
time will be a much more consistent way of estimating
the time between frames for animation.

Change-Id: If5c4034c6e1b017749d6f4ca727d564805672c39
 2014-11-20 01:45:04 +00:00
Scott Main
5208c59a12 Merge "docs: workflow index" 2014-11-20 01:36:35 +00:00
Scott Main
65b04adb3e Merge "docs: tools help update" 2014-11-20 01:36:18 +00:00
Scott Main
02a8637134 Merge "docs:revision updates" 2014-11-20 01:35:29 +00:00
Elliott Hughes
8e52c46c0e am 6973a63e: am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit '6973a63e967a8c913afa603b312ec9516f19d4fb':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:31:54 +00:00
Elliott Hughes
6973a63e96 am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit 'ec2d8d0bb8a36355b8d687c660b5c64e4aebd9b8':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:27:29 +00:00
Elliott Hughes
ec2d8d0bb8 am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit 'ea8ff822121cde16344ba2db194a5f17283fa740':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:22:37 +00:00
Elliott Hughes
ea8ff82212 Merge "Fix and be more explicit about plurals best practices." 2014-11-20 00:19:45 +00:00
Elliott Hughes
1fe7d496db Fix and be more explicit about plurals best practices. 
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".

Bug: 18429565
Change-Id: I09eb39ea6986850c3af28cca3052d319e3c97705
 2014-11-19 16:18:45 -08:00
Chris Craik
31b4d9fbc8 Merge "Fix missing ellipsis when just one character is truncated" 2014-11-19 23:57:51 +00:00
Alan Viverette
4247f06ba4 am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
* commit 'b130d5961cb154e8821cfa42fdd820d67497d84d':
  Remove underline and search icon from ActionBar search view
 2014-11-19 23:57:42 +00:00
Alan Viverette
6a6b828090 am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
* commit '552eca1a713ab8f6c60d6ec0d350ef33813cd25b':
  Implement Material-style delegate for CalendarView
 2014-11-19 23:53:25 +00:00
Alan Viverette
21aaf98f6f am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev 
* commit 'd8dd5100f453b0e82b75c56651889eca03414696':
  Fix several small layout and color issues
 2014-11-19 23:53:17 +00:00
Alan Viverette
b130d5961c Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 2014-11-19 23:52:24 +00:00
Alan Viverette
552eca1a71 Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 2014-11-19 23:51:34 +00:00
Alan Viverette
d8dd5100f4 Merge "Fix several small layout and color issues" into lmp-mr1-dev 2014-11-19 23:50:00 +00:00
Raph Levien
93e48e8cf1 Fix missing ellipsis when just one character is truncated 
The "moreChars" test in StaticLayout's generate method would evaluate to
false when the last character in a word caused the break. This in turn
suppressed the ellipsis in this case. The proposed fix is always to set
moreChars true in the code path where the line is broken because more
text wouldn't fit.

Bug: 17738112
Change-Id: Ifa1a69841ca952da4d1937dc8326778179b026b3
 2014-11-19 15:39:34 -08:00
xinhe
29b90ae5fd am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev 
* commit '77bfacc6fe0816e97be3a0f9a824759629d1f9eb':
  Add configuration to control converting sms destination number
 2014-11-19 22:55:37 +00:00
xinhe
77bfacc6fe Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev 2014-11-19 22:50:43 +00:00
Vinit Deshpande
33f97d8304 am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '77fe4c96b75550e5d22a294314b05beabd55e97a':
  Fix WPS docs for LABEL method
 2014-11-19 22:21:38 +00:00
Mathieu Chartier
96555a00f8 am 8415672e: am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" 
* commit '8415672e18cc6666d040435105fc7566ca525af4':
  Add zygote space to Dalvik Heap
 2014-11-19 22:17:21 +00:00
Vinit Deshpande
77fe4c96b7 am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e':
  Fix WPS docs for LABEL method
 2014-11-19 22:13:18 +00:00
John Spurlock
61f4f68571 am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 
* commit 'c70a4ccf45f669c07345cd438d68747d0558fd49':
  BatterySaver: Update disclosure string.
 2014-11-19 22:12:06 +00:00
Mathieu Chartier
8415672e18 am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" 
* commit '1073f2023efcc6cbd099358677d3e87ee996486d':
  Add zygote space to Dalvik Heap
 2014-11-19 22:09:29 +00:00
Ignacio Solla
81b104b3a8 am b85b969b: (-s ours) am c48a7bb1: (-s ours) am 1228e58e: (-s ours) Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 
* commit 'b85b969b6076356505f75448e2703b0a33ba5bbf':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-19 22:09:22 +00:00
John Spurlock
c70a4ccf45 Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 2014-11-19 22:09:14 +00:00
Ignacio Solla
b85b969b60 am c48a7bb1: (-s ours) am 1228e58e: (-s ours) Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 
* commit 'c48a7bb12d1e39dff5b9d28805e0c75bca9149fa':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-19 22:05:15 +00:00
Mathieu Chartier
1073f2023e am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" 
* commit '36c7f4b67326bad547f16aa6e72140bd839ab28d':
  Add zygote space to Dalvik Heap
 2014-11-19 22:04:28 +00:00
xinhe
b4e8478a73 resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE) 
Change-Id: I83bf149b4905b82e3787097c55b7d3cd026061dd
 2014-11-19 14:04:23 -08:00
Ignacio Solla
c48a7bb12d am 1228e58e: (-s ours) Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 
* commit '1228e58e88ac0ae2abb698ed3f933ac44a8851ee':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-19 21:59:37 +00:00
Mathieu Chartier
36c7f4b673 Merge "Add zygote space to Dalvik Heap" 2014-11-19 21:58:17 +00:00
Mathieu Chartier
99f628286f Add zygote space to Dalvik Heap 
Broken by
https://android-review.googlesource.com/#/c/115446/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

(cherry picked from commit 7fc9176c8a2102fb5be3668404bd15feb6878c89)

Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b
 2014-11-19 13:54:00 -08:00