Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,651 Commits 3 Branches 0 Tags
499ea6b6d67609624d85d8ffe2df2f5d435ab895
Commit Graph

168651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
d8dd5100f4 Merge "Fix several small layout and color issues" into lmp-mr1-dev 2014-11-19 23:50:00 +00: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
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
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 7fc9176c8a)

Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b
 2014-11-19 13:54:00 -08:00
John Spurlock
a7b6a278d0 BatterySaver: Update disclosure string. 
Bug: 18451615
Change-Id: Iea8c71a4ef1e3217953672b2a8691d612bacf8a9
 2014-11-19 16:53:52 -05:00
Ignacio Solla
1228e58e88 Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 2014-11-19 21:53:43 +00:00
Mathieu Chartier
78f235db2d am 7fc9176c: Add zygote space to Dalvik Heap 
* commit '7fc9176c8a2102fb5be3668404bd15feb6878c89':
  Add zygote space to Dalvik Heap
 2014-11-19 21:51:35 +00:00
Ignacio Solla
e7cf27b664 [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0c
 and 53f2569487)
 2014-11-19 21:47:13 +00:00
Mathieu Chartier
7fc9176c8a Add zygote space to Dalvik Heap 
Broken by
https://googleplex-android-review.git.corp.google.com/#/c/590612/

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

Bug: 18447855

Change-Id: I4a58480f1ef1eb17e760245d8690ce92e28ebea3
 2014-11-19 13:43:40 -08:00
Jason Monk
bdf37b714d am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
* commit '2e982258f10e9af21ec328faf41e77b38b109738':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-19 21:22:29 +00:00
Jason Monk
2e982258f1 Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 2014-11-19 21:18:22 +00:00
Vinit Deshpande
a34f3d30c6 am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '800bf3ae6e9affb151b3b0b368c4a3dd22bb1fa0':
  Fix WPS docs for LABEL method
 2014-11-19 20:29:56 +00:00
Vinit Deshpande
800bf3ae6e Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 2014-11-19 20:17:22 +00:00
Alan Viverette
7573f496a1 Fix several small layout and color issues 
Adjusts switch track asset for consistent alignment across DPI buckets,
adjusts edit text background. Lightens the "Light" theme action bar
color so that it doesn't blend in with the action bar shadow.

BUG: 18430444
BUG: 18356558
BUG: 18390994
Change-Id: I1d1e26239fa0c921a65e4ec8b5df0b0093b3989c
 2014-11-19 11:59:24 -08:00
xinhe
62a22d5b1f resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) 
The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff
 2014-11-19 11:48:43 -08:00
Andrew Lee
76cc56c0f9 am 3f424477: am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 
* commit '3f4244773d4479c79705dc397abf0d76555d7ef9':
  Add GENERIC_CONFERENCE to phone capabilities.
 2014-11-19 19:10:44 +00:00
Andrew Lee
3f4244773d am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 
* commit 'e6a1e993c2e3663ee60085b66fe8697d5de6e268':
  Add GENERIC_CONFERENCE to phone capabilities.
 2014-11-19 19:06:32 +00:00
Andrew Lee
e6a1e993c2 Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 2014-11-19 19:00:41 +00:00
Andreas Gampe
387116f557 am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" 
* commit 'c3507d1098a444176a7270cba7e5299af7f77350':
  Frameworks/base: Replace LOG_FATAL_IF in core/jni
 2014-11-19 18:26:51 +00:00
Andres Morales
39843bfbed am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '29db396ea91651f2f17e21629f782ce4c19e0f33':
  Add a checksum to FRP partition
 2014-11-19 18:21:19 +00:00
Andreas Gampe
c3507d1098 Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" 2014-11-19 18:16:19 +00:00
Andres Morales
29db396ea9 am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '6722598ef3d23f75d244399536b2302b30388c51':
  Add a checksum to FRP partition
 2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
Chih-hung Hsieh
b380d7eeee am b1e4e89b: Merge "Fix incorrect usage of bool" 
* commit 'b1e4e89b86ee12335fa1398a6b2bc0a0604599de':
  Fix incorrect usage of bool
 2014-11-19 18:09:25 +00:00
Chih-hung Hsieh
b1e4e89b86 Merge "Fix incorrect usage of bool" 2014-11-19 18:01:20 +00:00
Amit Mahajan
bb35bbf198 am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:57:39 +00:00
John Spurlock
34a2ee695d am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '9d48ec7a5c639226f69377d41c4fcb2d3e17c13e':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:57:25 +00:00
Geoff Mendal
88a080bc68 am 5b95c755: (-s ours) am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '5b95c755821a966b411b164df18b928d2eda71f1':
  Import translations. DO NOT MERGE
 2014-11-19 17:56:45 +00:00