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

47266 Commits

Author SHA1 Message Date
Alan Lau
40274ada4a am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit 'b12318be13be00842d124e4391ce5eabce2d5104':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 17:47:03 +00:00
Alan Lau
839ca0d5fa am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '06a8455421978d06597de2abfccabef928d06056':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 17:44:20 +00:00
Alan Lau
231a32a132 am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 
* commit 'c006227265d7ac705ebeef2f7d87104fdb63f32a':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
 2014-07-30 17:37:02 +00:00
Alan Lau
06a8455421 Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
7ab1900a5a Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying"" 
This reverts commit af60e56b39582ea90ccd7601cd06350a50bf6500.

Change-Id: I1aa698608773b9e540457831e11218f371c71268
 2014-07-30 17:35:29 +00:00
Alan Lau
273906bb6a Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator"" 
This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
 2014-07-30 17:30:15 +00:00
Alan Lau
b12318be13 Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 2014-07-29 21:36:00 +00:00
Alan Lau
1fa3c9bef2 Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" 
This reverts commit cbeef01cce314e3a3977b042d8ec0744816c0df4.

Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb
 2014-07-30 17:35:20 +00:00
Alan Lau
52baf3d096 am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:07:23 +00:00
Alan Lau
d2e1ecb67b am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 19:58:00 +00:00
Alan Lau
18b5f44c5e am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 19:57:55 +00:00
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60 am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:53:26 +00:00
Alan Lau
cbeef01cce Revert "DO NOT MERGE Fix line breaking for clusters in narrow views" 
This reverts commit a28e4764994283c3595dd41f12e425cf7dc0d985.

Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
 2014-07-28 19:52:11 +00:00
Alan Lau
af60e56b39 Revert "DO NOT MERGE Fix extraneous allocation and copying" 
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.

Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
 2014-07-28 19:51:01 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
1a408a344c DO NOT MERGE Fix extraneous allocation and copying 
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit 733b3c0f8b77fefcd234c94170faa4e7bd76074c)
 2014-07-28 19:06:10 +00:00
Anish Athalye
a28e476499 DO NOT MERGE Fix line breaking for clusters in narrow views 
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit 162713dd0b72af79c1b2286985f7e79f043cd915)
 2014-07-28 18:47:40 +00:00
Alan Lau
40b0d4d751 Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Alan Lau
97170e0c48 Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Anish Athalye
0c87dfd25d DO NOT MERGE Implement line breaking using ICU break iterator 
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
 2014-07-28 18:48:01 +00:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev 
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
 2014-07-24 18:06:03 +00:00
Prashant Malani
b4dcc64fe6 Merge "Revert "Remove circular mask"" into klp-modular-dev 2014-07-24 15:36:14 +00:00
Prashant Malani
a04ea61db5 Revert "Remove circular mask" 
This reverts commit 2e8b27e898af3af1165a79e7c5f8b59f63f20a2f.

It also makes the circularMask option configurable via overlay.
It is set to false by default.

An offset dimension entry is also provided, for displays which have
a "chin". This is set to 0 by default.

Bug: 16380982
Change-Id: I16ec3e8d8882a6683c9155055944e5c2f5cd781e
 2014-07-23 17:26:08 -07:00
Robert Ly
39572996f2 am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 
* commit '1903bbb88d8e2e1921b0441911cb73966d3bca4a':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
 2014-07-23 21:06:47 +00:00
Robert Ly
1903bbb88d am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 
* commit '22bdcd2f829dd9226978c9ec4405fd89d4562d73':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
 2014-07-23 21:02:12 +00:00
Scott Rowe
e2bdaea318 cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1 
Change-Id: I21424c1407b44554ac135248dabc2328bc70aef9
 2014-07-23 20:54:50 +00:00
Guang Zhu
f59ce46880 am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'b477fc6c2fcd04e6952a7eec856d30b64fd95e0c':
  add command to enable bt snoop log
 2014-07-18 03:31:43 +00:00
Guang Zhu
946f207d3d add command to enable bt snoop log 
Change-Id: I22a6482a90c2bb976a5ce44946e9f0fb8b59e6b2
 2014-07-17 20:24:56 -07:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:29:08 +00:00
Andrew Solovay
5755377592 am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:22:57 +00:00
Andrew Solovay
5ae1335477 cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38 
Doc had inaccurately said that getLaunchIntentForPackage() throws an
exception if the package name is not recognized; in fact, it returns
null. Also cleaned up some style issues for that Javadoc item.

Doc is staged to:

http://asolovay.mtv:9655/reference/android/content/pm/PackageManager.html#getLaunchIntentForPackage(java.lang.String)

Bug: 15022655
Original SHA1: I2eab0956eaedac71289e19a3618a3553908f8c38

Change-Id: Ief8dfaac248ba03779c6f13237aff9b26d362fd9
 2014-07-15 15:08:58 -07:00
Michael Kolb
dca272b8c2 am 0cb38d2e: Merge "Add configuration for activity thumbnails" into klp-modular-dev 
* commit '0cb38d2e5ab32fd34c8129f3c2d1c158bad9abc3':
  Add configuration for activity thumbnails
 2014-07-11 01:46:12 +00:00
Aaron Whyte
d2b5f7da35 am f5e67474: Allow overlays to configure ConnectivityService\'s network sampling to not wake the device. This can increase clockwork device battery life. Bug:15455204 
* commit 'f5e6747440cc0d29c663a792e32d9618f842ecf2':
  Allow overlays to configure ConnectivityService's network sampling to not wake the device. This can increase clockwork device battery life. Bug:15455204
 2014-07-11 01:46:08 +00:00
Aaron Whyte
f5e6747440 Allow overlays to configure ConnectivityService's network sampling to not wake the device. 
This can increase clockwork device battery life.
Bug:15455204

Change-Id: Ifc551e6a522627dc8e5cfdfb8f56d4e3cbeea936
 2014-07-10 14:05:35 -07:00
Michael Kolb
0cb38d2e5a Merge "Add configuration for activity thumbnails" into klp-modular-dev 2014-07-10 20:49:26 +00:00
Michael Kolb
5f6238e4a7 Add configuration for activity thumbnails 
Bug: 15750584

Change-Id: I0b2bfb46022b46d7649f6d9ba9ba74cdfc70a6ea
 2014-07-10 14:43:51 -07:00
Elliott Hughes
f6be5a7ac8 am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu." 
* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
  Switch frameworks/base/core/jni to the new icu.
 2014-07-10 00:16:29 +00:00
Elliott Hughes
f072fda13f am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu." 
* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.
 2014-07-10 00:08:29 +00:00
Elliott Hughes
effcc83e42 Merge "Switch frameworks/base/core/jni to the new icu." 2014-07-09 22:27:32 +00:00
Elliott Hughes
92b1896dfd Switch frameworks/base/core/jni to the new icu. 
Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
 2014-07-09 16:56:11 -07:00
Brian Carlstrom
ce75618e12 am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]" 
* commit '5aba0149b953fb8e85851811dde995fb35c10051':
  Make dex2oat heap size product configurable [frameworks/base]
 2014-07-09 12:36:47 +00:00
Brian Carlstrom
5aba0149b9 am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]" 
* commit 'b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
  Make dex2oat heap size product configurable [frameworks/base]
 2014-07-09 12:21:54 +00:00
Brian Carlstrom
b85afb38e8 Merge "Make dex2oat heap size product configurable [frameworks/base]" 2014-07-08 22:56:31 +00:00
Brian Carlstrom
6d77eb99bf Make dex2oat heap size product configurable [frameworks/base] 
Bug: 15919420
Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
 2014-07-08 15:05:41 -07:00
Robert Greenwalt
ca19b7cbdf am a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun" 
* commit 'a7efe9b8743e4a7d8a5b9ef247f6d780f33b4021':
  Add Telefonica/Movistar specific APN details for dun
 2014-07-08 17:03:36 +00:00
Robert Greenwalt
a7efe9b874 am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun" 
* commit '912700fca8e02fe93fca7d95ef22472f77349ffe':
  Add Telefonica/Movistar specific APN details for dun
 2014-07-08 16:59:17 +00:00
Brian Carlstrom
1f8eb4a6b0 am 044492e1: am 52a154fe: Merge "Remove" 
* commit '044492e1b710c1e604c02b08e0ec97cbb1d5d513':
  Remove
 2014-07-07 21:00:07 +00:00
Brian Carlstrom
044492e1b7 am 52a154fe: Merge "Remove" 
* commit '52a154febb7c06b142116235c368417dd5e542ba':
  Remove
 2014-07-07 20:55:16 +00:00