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

182202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
7c72668f19 Adjust activity display metrics based on stack configuration. 
Apps normally use context.getResources().getDisplayMetrics()
or getWindowManager().getDefaultDisplay() to get information
about the screen dimensions. Not all the screen space is available
for apps in a multi-window environment, so we limit the dimensions
of the display object exposed to the app to that of the containing
stack.

Bug: 19225079
Bug: 19354838
Change-Id: I8dc3a6c9b99ecedcca28fc4ddaba9f31feb4f871
 2015-02-13 21:12:47 -08:00
Raph Levien
80955e105d Merge "Interval tree for SpannableStringBuilder" 2015-02-12 20:34:46 +00:00
Chris Craik
d12940797c Merge "Glop Bitmap and RoundRect clipping support" 2015-02-12 20:32:58 +00:00
Chris Craik
0519c810a5 Glop Bitmap and RoundRect clipping support 
Change-Id: I4577546a5d2e5f084cc03f39a89db9231b8111ee
 2015-02-12 12:30:59 -08:00
Raph Levien
d7c020e9e5 Interval tree for SpannableStringBuilder 
This CL greatly improves the speed of SpannableStringBuilder by storing
the spans as an interval tree with binary search.

Bug: 7404182
Change-Id: I2540b2cfe8aef128337e63829479660ba51e62b5
 2015-02-12 12:30:52 -08:00
destradaa
1ea5736339 Merge "Intern strings used in Sensor information." 2015-02-12 20:30:07 +00:00
Geoff Mendal
28439f261b am 615adb8b: (-s ours) am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '615adb8bc80efa8c4b6d45387a500e8ab77bc692':
  Import translations. DO NOT MERGE
 2015-02-12 19:40:59 +00:00
Jeremy Joslin
47a0e664b8 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-12 19:40:58 +00:00
Jeremy Joslin
549aa2b9b7 am f69f3737: am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit 'f69f3737ba8cb2acb481dc78de3c5275bae112e7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 19:40:48 +00:00
Jeremy Joslin
1084df02ad am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
automerge: f69f373

* commit 'f69f3737ba8cb2acb481dc78de3c5275bae112e7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 19:39:20 +00:00
Benjamin Franz
d51584dee7 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
automerge: 6076ef9

* commit '6076ef9355fec90c40d84abaf2c71345f32badfb':
  Fix the javadocs for lock task mode intents.
 2015-02-12 19:37:50 +00:00
Narayan Kamath
6f609928cf am c7e48719: Merge "Remove references to persist.sys.language/country." automerge: 8be3724 
automerge: 00e821a

* commit '00e821a8608efdc19041bdda1e832d3d4b3c29e2':
  Remove references to persist.sys.language/country.
 2015-02-12 19:36:35 +00:00
Svetoslav
c913ff2819 Merge "Fix a reversed condition in the next alarm validator" 2015-02-12 19:32:21 +00:00
Svetoslav
64d6e9ceec Fix a reversed condition in the next alarm validator 
bug:19361375

Change-Id: Ib5ac90503842aafd994423632fd1f463e49088a0
 2015-02-12 11:30:39 -08:00
Neil Fuller
a2c7884518 Merge "Remove usages of FloatMath" automerge: a8e8cdb automerge: 27316a9 
automerge: c1a5e82

* commit 'c1a5e82c25dba954cf1c06729e53bfb67667bcbb':
  Remove usages of FloatMath
 2015-02-12 19:29:45 +00:00
Tao Bao
e810913eea Merge "resolve merge conflicts of 6d8886a to master." 2015-02-12 19:27:34 +00:00
Tao Bao
0d27729dd8 resolve merge conflicts of 6d8886a to master. 
Change-Id: If8798a1d87b35e2db56211bf0e7dea94bed91b6a
 2015-02-12 11:26:00 -08:00
Geoff Mendal
615adb8bc8 am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'a673af77d95f4a3d46e5d71188256b27e06cc442':
  Import translations. DO NOT MERGE
 2015-02-12 19:20:42 +00:00
Alan Viverette
cbcf1d4854 Merge "Add support for user-selectable night mode" 2015-02-12 19:15:53 +00:00
Geoff Mendal
a673af77d9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 19:13:54 +00:00
Alan Viverette
4cc1e9e707 Add support for user-selectable night mode 
Adds a Material theme that automatically selects light or dark UI based
on the night mode resource qualifier.

Removes restriction that night mode only works when car mode is enabled
or the device is docked, which was applied inconsistently anyway and
only actually worked when in car mode (regardless of docked state).
Night mode is now always applied according to the system preference.

Change-Id: I526807c907eb29a2ab588d15932afe3e6ab180c2
 2015-02-12 11:01:06 -08:00
Jeremy Joslin
f69f3737ba am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:56:35 +00:00
Alan Viverette
3358d5c0a7 Merge "API for adding layers to LayerDrawable" 2015-02-12 18:51:41 +00:00
Geoff Mendal
ceb7ae3170 Import translations. DO NOT MERGE 
Change-Id: Idd108e5eb791007b3604c67ce4a0853a368a445e
Auto-generated-cl: translation import
 2015-02-12 10:51:28 -08:00
Alan Viverette
d8c18e81c0 API for adding layers to LayerDrawable 
Change-Id: I859c956a47d95fa1ce65b9eea9bc7be4659486bf
 2015-02-12 18:49:42 +00:00
Jeremy Joslin
1267462c0b am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit 'f456d4dcc042581cb2a3ba540538898f2cc925b7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:47:14 +00:00
Jeremy Joslin
f456d4dcc0 am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:41:17 +00:00
Jeremy Joslin
20be0e25ba Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 2015-02-12 18:34:03 +00:00
Wale Ogunwale
5e789f03b2 Fixed bug in 'am stack split' command. 
Change-Id: Id3efb65a3f9cbf3c223ea08d51e2028180bd5479
 2015-02-12 09:25:52 -08:00
Benjamin Franz
6076ef9355 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit 'dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f':
  Fix the javadocs for lock task mode intents.
 2015-02-12 17:02:09 +00:00
Benjamin Franz
dd0027cfda am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:52:34 +00:00
Benjamin Franz
40ab8bb229 am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:45:06 +00:00
Narayan Kamath
00e821a860 am c7e48719: Merge "Remove references to persist.sys.language/country." 
automerge: 8be3724

* commit '8be3724a06f7b2d28c6664ca11a03f91f97f0972':
  Remove references to persist.sys.language/country.
 2015-02-12 16:41:41 +00:00
Narayan Kamath
8be3724a06 am c7e48719: Merge "Remove references to persist.sys.language/country." 
* commit 'c7e487193aed3b102d6e55e0817de6e0460e0236':
  Remove references to persist.sys.language/country.
 2015-02-12 16:37:58 +00:00
Narayan Kamath
c7e487193a Merge "Remove references to persist.sys.language/country." 2015-02-12 16:31:08 +00:00
Benjamin Franz
c70d0e71c0 Fix the javadocs for lock task mode intents. 
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
 2015-02-12 16:12:58 +00:00
Narayan Kamath
b61db8229a Remove references to persist.sys.language/country. 
Addresses a couple of TODOs now that all usages have been
removed and fixes a doc that specifies how the emulator locale
can be set.

bug: 17691569

Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c
 2015-02-12 13:16:55 +00:00
Neil Fuller
c1a5e82c25 Merge "Remove usages of FloatMath" automerge: a8e8cdb 
automerge: 27316a9

* commit '27316a93e5979859ae98f506eca365784353007a':
  Remove usages of FloatMath
 2015-02-12 10:00:41 +00:00
Neil Fuller
27316a93e5 Merge "Remove usages of FloatMath" 
automerge: a8e8cdb

* commit 'a8e8cdbb17164c0124e04c376110637af96d5e89':
  Remove usages of FloatMath
 2015-02-12 09:57:57 +00:00
Neil Fuller
a8e8cdbb17 Merge "Remove usages of FloatMath" 2015-02-12 09:26:47 +00:00
Neil Fuller
e573aa9371 Remove usages of FloatMath 
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d
 2015-02-12 09:20:31 +00:00
Eino-Ville Talvala
346066ef90 am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
automerge: ad5591f

* commit 'ad5591f819466fc1c87d9ca76be8c06673ccce34':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 07:52:49 +00:00
Lorenzo Colitti
ffba84a155 am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev 
automerge: fd90d71

* commit 'fd90d718f43e676e6487ca089e058cdc5d7f7981':
  Make reportInetCondition revalidate if the report differs from our state
 2015-02-12 07:51:11 +00:00
Adam Powell
f4071c709d am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev 
automerge: bee1def

* commit 'bee1def31bb7a3a22e7c83904a3d8c418eeb5e48':
  Add DENSITY_280
 2015-02-12 07:49:31 +00:00
Tao Bao
6d8886ac46 resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp 
Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1
 2015-02-11 22:32:05 -08:00
Eino-Ville Talvala
ad5591f819 am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit 'f5d304636d27ea300c092fac0f0214170a89ba39':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:54:34 +00:00
Eino-Ville Talvala
f5d304636d am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit '4fa3a80b6cefdc500de6c7daacc7ef3e160a0543':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:48:50 +00:00
Eino-Ville Talvala
4fa3a80b6c am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit 'a5f301c7fb048461197a6032f66b35772a3157f9':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:39:05 +00:00
Eino-Ville Talvala
a5f301c7fb Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 2015-02-12 05:33:28 +00:00
Tao Bao
e1e1cd9dfa am d884c63c: Merge "Use ICU for relative time formatting" 
* commit 'd884c63c100ecc9e96fa55de5110f7034ba9cc03':
  Use ICU for relative time formatting
 2015-02-12 04:39:01 +00:00