Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
186,267 Commits 3 Branches 0 Tags
63fa14bdfb953f615ea013b27ccc7b3a42dc169e
Commit Graph

46340 Commits

Author SHA1 Message Date
Raph Levien
63fa14bdfb Merge "Calculate line breaks using Minikin" 2015-03-27 05:59:15 +00:00
Raph Levien
c94f742f7e Calculate line breaks using Minikin 
This patch moves the calculation of line breaks for StaticLayout into
the new LineBreaker class provided by Minikin. This specific patch
should preserve existing functionality, but perhaps performance is
better, and the movement opens the door to much more sophisticated
line-breaking.

Change-Id: Iafccb9da4e3559bbeaeb2c7c85f86ddfd8ae2fa1
 2015-03-26 22:52:32 -07:00
Adam Lesinski
4b6bd8d36b Retrieve WiFi info outside of BatteryStatsImpl 
In order to not deadlock the system, we need to retrieve
WiFi energy info outside of the BatteryStats lock. We do this,
then pass that data down to BatteryStatsImpl to process.

b/19729960

Change-Id: Ib8beba1d5ac81d89144d502c4b688d0a88c5b102
 2015-03-26 17:49:51 -07:00
Aravind Akella
02bc1fe6b0 Merge "Pipe the packageName of the application from the java layer to SensorService." 2015-03-26 22:17:22 +00:00
Ricky Wai
9aaaa1ebb3 Add RawContactsEntity.CORP_CONTENT_URI 
Bug: 19551325
Change-Id: I7b2801e4a80ac5da1f1d53e41043657d07874ae6
 2015-03-26 18:48:13 +00:00
James Cook
ccce81cf44 Merge "Fix undo of text pasted into TextView with TextWatcher" 2015-03-26 17:15:31 +00:00
Rubin Xu
6a38e43b8b Fix build breakage by ag/661236 
Change-Id: Ia42440f238d76066f449dccc463b0485ab558c4d
 2015-03-26 14:47:45 +00:00
Rubin Xu
a55c27a79b Merge "Change doc for device initializer agent extra's type." 2015-03-26 13:16:07 +00:00
Rubin Xu
44ef750bd4 Change doc for device initializer agent extra's type. 
Change the DIA extra's type to ComponentName, making it consistent with
EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME.

Bug: 19891726
Change-Id: Ib41a9d22ff22e114cde80010fbc41db26f2b5f82
 2015-03-26 12:11:04 +00:00
Adam Powell
9c66583379 Merge "Fix default gravity for View foreground drawables" 2015-03-26 02:17:49 +00:00
Adam Powell
6579f5090a Fix default gravity for View foreground drawables 
Use the expected default gravity of Gravity.FILL as FrameLayout used
to do. Reset the bounds correctly when a new drawable is set.

Bug 19922909

Change-Id: I80181923c37e33ba308e364e322d84f3cc86e93b
 2015-03-25 19:14:12 -07:00
Filip Gruszczynski
1c6bfd6944 am 70ef3af8: am 2493d947: am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 
* commit '70ef3af8d953091e3595de63a9a2f68a064c2352':
  Don't use windowOutsetBottom for insets, depend on display padding only.
 2015-03-25 23:41:15 +00:00
Filip Gruszczynski
2493d94724 am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 
* commit '9001f14b205aba4d9fa236611b122492b92d3b4a':
  Don't use windowOutsetBottom for insets, depend on display padding only.
 2015-03-25 22:43:02 +00:00
Filip Gruszczynski
9001f14b20 Merge "Don't use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 2015-03-25 22:37:38 +00:00
Alan Viverette
26c44eeecf Add accessibility action for making a node visible on screen 
Bug: 19872425
Change-Id: I39c971f949d08d6573da2e5567dca1e187a17d7e
 2015-03-25 14:54:13 -07:00
Aravind Akella
88445990b4 Pipe the packageName of the application from the java layer to SensorService. 
Change-Id: I8610d676be0249e1047bb539bfeb76cc34538edf
 2015-03-25 14:42:38 -07:00
Dianne Hackborn
73484d8b66 Merge "Battery stats: wakeup alarm tracking, general cleanup." 2015-03-25 21:27:54 +00:00
Alan Viverette
527b45376a am 3a79e434: am a0d3d003: am 5fc9b336: Merge "Consider RTL layout in DPAD navigation in Gallery" 
* commit '3a79e434a6e840f47a47387743385a2cd5faab54':
  Consider RTL layout in DPAD navigation in Gallery
 2015-03-25 21:08:51 +00:00
Chad Brubaker
b09f1083e1 am 6558d4e7: am ee468ea8: am 6326f964: Merge "Make application/client id an object" 
* commit '6558d4e75e8a129b1b1a78824ed091962a2574ef':
  Make application/client id an object
 2015-03-25 21:08:35 +00:00
Alex Klyubin
1d321fa14f am 2faa736e: am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one." 
* commit '2faa736e7dfab88bfdf1ff7022397af182815503':
  Framework's NetworkSecurityPolicy delegates to libcore's one.
 2015-03-25 21:07:48 +00:00
Chad Brubaker
85d787d336 am c217adaf: am 9db6e4d7: am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes" 
* commit 'c217adaf6756003684d195713dda8a9b215f5dbc':
  Enforce tag types in KeymasterArgument classes
 2015-03-25 21:07:41 +00:00
Alan Viverette
16802f0de2 am 46c95313: am ddb30cd3: am 7506f499: Merge "Fix to crash when clicking text link without view activity" 
* commit '46c953138298285d9cb06a75030fc73081ccc121':
  Fix to crash when clicking text link without view activity
 2015-03-25 21:07:34 +00:00
Jim Miller
63c8c4937e Fix the build 
Change-Id: I15cc8d517a1713b003aad396aa5d2b29cb808338
 2015-03-25 14:06:02 -07:00
James Cook
2205425b94 Fix undo of text pasted into TextView with TextWatcher 
Pasted text is directly inserted into the TextView buffer, so it looks
like a programmatic insert to the undo system. This is fine, but we
need to be sure that subsequent modification by a TextWatcher (for
example, to add spaces to a credit card number) is merged into the same
undo operation -- from the user's perspective, pasting in the text and
having spaces inserted are a single operation.

Also clean up mForceMerge flag in EditOperation -- we don't need to
store it across edits, just use it when a new edit comes in.

CTS test to follow.

Bug: 19332904
Change-Id: I7b3c97c08b83faebeab9f1708b0d6eac6d151d50
 2015-03-25 14:04:01 -07:00
Alan Viverette
a0d3d003c8 am 5fc9b336: Merge "Consider RTL layout in DPAD navigation in Gallery" 
* commit '5fc9b336ebb6fc224b3e77af388024dea029fbb3':
  Consider RTL layout in DPAD navigation in Gallery
 2015-03-25 20:18:37 +00:00
Chad Brubaker
ee468ea881 am 6326f964: Merge "Make application/client id an object" 
* commit '6326f964769c603382ee6694b33954b4ff9b9a52':
  Make application/client id an object
 2015-03-25 20:12:49 +00:00
Alan Viverette
5fc9b336eb Merge "Consider RTL layout in DPAD navigation in Gallery" 2015-03-25 20:04:22 +00:00
Prerepa Viswanadham
e564c00e2b Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge" 2015-03-25 20:02:29 +00:00
Jim Miller
9fc9ac5f77 Merge "Refactor fingerprint API" 2015-03-25 19:45:29 +00:00
Amith Yamasani
f198900250 Merge "Fix documentation for ACTION_SET_PROFILE_OWNER" 2015-03-25 19:37:43 +00:00
Chad Brubaker
6326f96476 Merge "Make application/client id an object" 2015-03-25 19:25:55 +00:00
Alex Klyubin
6a7ac540e1 am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one." 
* commit 'a9f628662c348c5926caf5e2df0fd2f245a715bf':
  Framework's NetworkSecurityPolicy delegates to libcore's one.
 2015-03-25 19:03:34 +00:00
Chad Brubaker
9db6e4d7a3 am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes" 
* commit '5aeb085389954a32e1ea2189b7bec8080b0226c5':
  Enforce tag types in KeymasterArgument classes
 2015-03-25 19:03:28 +00:00
Alan Viverette
ddb30cd36f am 7506f499: Merge "Fix to crash when clicking text link without view activity" 
* commit '7506f499b523d05c6bca5acb6d83f55820d33771':
  Fix to crash when clicking text link without view activity
 2015-03-25 19:03:21 +00:00
Roozbeh Pournader
d1af05efb0 Merge "Make Html#toHTML() generate correct bidi directions." 2015-03-25 18:49:51 +00:00
Alex Klyubin
a9f628662c Merge "Framework's NetworkSecurityPolicy delegates to libcore's one." 2015-03-25 18:13:18 +00:00
Amith Yamasani
814e9873bd Fix documentation for ACTION_SET_PROFILE_OWNER 
Does not require the mentioned permissions.

Bug: 19892754
Change-Id: I22f2563c4f50457dbeb22d734e96a99ef79adf2b
 2015-03-25 11:11:54 -07:00
Chad Brubaker
5aeb085389 Merge "Enforce tag types in KeymasterArgument classes" 2015-03-25 18:00:48 +00:00
Andrei Kapishnikov
be22970dc2 Merge "Framework: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2" 2015-03-25 16:59:46 +00:00
Alex Klyubin
17badbaf83 am 98ff619d: am d4a2e7c4: am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy." 
* commit '98ff619d79dd213b21e0cb468d6432f0b4e153b4':
  Address pending comments for NetworkSecurityPolicy.
 2015-03-25 16:52:44 +00:00
Bryce Lee
a223d65830 am 3309be5e: am 21b7e6de: am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev 
* commit '3309be5e7bc782d89adaf4abca5f1f81649c655f':
  Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
 2015-03-25 16:52:30 +00:00
Alan Viverette
7506f499b5 Merge "Fix to crash when clicking text link without view activity" 2015-03-25 16:35:37 +00:00
Alex Klyubin
d4a2e7c404 am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy." 
* commit 'ff022cb1bd70fc4c9f973af5afebf51517bda572':
  Address pending comments for NetworkSecurityPolicy.
 2015-03-25 16:18:50 +00:00
Bryce Lee
21b7e6de94 am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev 
* commit 'c831b978238d5ed200ca329c540eff00faba77e3':
  Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
 2015-03-25 16:09:48 +00:00
Bryce Lee
c831b97823 Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev 2015-03-25 16:06:17 +00:00
Alex Klyubin
403a494d56 Framework's NetworkSecurityPolicy delegates to libcore's one. 
Now that the libcore's NetworkSecurityPolicy abstraction is in place,
the framework version of the abstraction should delegate to the
libcore one, to avoid them getting out of sync.

Bug: 19215516
Change-Id: Ic57341d703a13e0fb100dc414958e8fd54e03816
 2015-03-25 09:00:37 -07:00
Zoltan Szatmary-Ban
9c5dfa5c79 Data Usage public API 
Added new API consisting of android.app.usage.NetworkUsageManager and
android.app.usage.NetworkUsageStats. Through them data usage on a
network interface can be programmatically queried. Both summary and
details are available.

Bug: 19208876
Change-Id: I0e0c4b37ae23ad1e589d4b0c955b93f28ba4333e
 2015-03-25 15:53:38 +00:00
Andrei Kapishnikov
35e71f57b4 Framework: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2 
Related CL: https://googleplex-android-review.git.corp.google.com/657588
Bug: 19673809

Change-Id: I292f9a5b5c511c9102fb43fe938b0389af7fbc54
 2015-03-25 11:12:01 -04:00
Zoltan Szatmary-Ban
1181ed8a43 Add isActiveAdminWithPolicy to DevicePolicyManagerInternal 
This method will be used by other system services to decide whether an
app is a profile owner or device owner.

Change-Id: I9577700d03ce2c80c798a60c6c2f480fd1913f43
 2015-03-25 14:40:05 +00:00
Gus Prevas
4e2541c543 am 60b0846f: am c4d7fc10: am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 
* commit '60b0846fc2be8ba462bcfa535cbaced6c43e532b':
  Changes callback to a WeakReference in ActivityContainerCallback.
 2015-03-25 13:16:26 +00:00