Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,864 Commits 3 Branches 0 Tags
f7936df6887b2d351114309efbcd86d00d250b6d
Commit Graph

43576 Commits

Author SHA1 Message Date
Griff Hazen
f7936df688 am 472b990a: am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '472b990ae11f4ae4c16d90cbb02e9efa868db382':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:37:00 +00:00
Griff Hazen
472b990ae1 am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '07e8b2fb7409f0893d13a6cfb4687ba70b220e91':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:33:17 +00:00
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Nicolas Prevot
f6319c7e78 am b01a483e: am 7ca8674f: am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 
* commit 'b01a483e64a1beab6eb680c82ab472ed159e394d':
  Do not fix uris inside the system.
 2014-11-04 10:59:40 +00:00
Nicolas Prevot
b01a483e64 am 7ca8674f: am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 
* commit '7ca8674f66047c409031f3c5e4590c97c62f910d':
  Do not fix uris inside the system.
 2014-11-04 10:55:26 +00:00
Nicolas Prevot
ac7774e8c1 Merge "Do not fix uris inside the system." into lmp-mr1-dev 2014-11-04 10:47:25 +00:00
Narayan Kamath
f47a6db44b am f2196a6e: am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit 'f2196a6ed5988f87d0e04cc30f0f82f7ea431095':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:16:22 +00:00
Narayan Kamath
f2196a6ed5 am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit '6220810b8167deee7bf2577f5136736473cbea1c':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:08:53 +00:00
Narayan Kamath
78a3b7d5af Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 2014-11-04 09:48:19 +00:00
Deepanshu Gupta
0ad1eb3349 am 837e65be: am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 
* commit '837e65be0d7259bdc122c19676f9ad0b711b000f':
  Use the right layout for inflating Action Bar.
 2014-11-04 02:59:26 +00:00
Deepanshu Gupta
837e65be0d am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 
* commit 'a36980980886a645627542a7bcabf0d718ea79c9':
  Use the right layout for inflating Action Bar.
 2014-11-04 02:50:10 +00:00
Dianne Hackborn
41ca024387 am 726715e1: am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit '726715e1138d880656a13014d447a14b3998b132':
  Few more small meminfo improvements.
 2014-11-04 02:28:18 +00:00
Dianne Hackborn
726715e113 am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
  Few more small meminfo improvements.
 2014-11-04 02:21:11 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:08:23 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev 
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
 2014-11-04 00:49:43 +00:00
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
Dianne Hackborn
1842930762 Few more small meminfo improvements. 
- Add in category for graphics driver, and knowledge about it
  for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
  that, so it is clear what they are talking about.

Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1
 2014-11-03 13:58:11 -08:00
Kenny Root
d130ba8b00 am affff329: am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'affff329088e569158e0ee45ee0e580b3c285722':
  Track change to Conscrypt
 2014-11-03 18:58:09 +00:00
Kenny Root
affff32908 am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
  Track change to Conscrypt
 2014-11-03 18:50:21 +00:00
John Reck
d0f91ebaef am 43973c9d: am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480 
* commit '43973c9d732d74dec12e796fb40ae285c1687d6a':
  Fix cancel crash
 2014-11-03 18:41:39 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
 2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
John Reck
43973c9d73 am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev 
automerge: 9280480

* commit '928048040cb5cd205ff5e74f9393dca2371c519a':
  Fix cancel crash
 2014-11-03 18:32:20 +00:00
John Reck
1787b4ea43 Merge "Fix cancel crash" into lmp-mr1-dev 2014-11-03 18:27:41 +00:00
John Reck
55b46eff39 Fix cancel crash 
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
 2014-11-03 10:00:33 -08:00
Griff Hazen
5f2edfc12c Improve support for the barcode-on-screen use case for wearables. 
Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.

Bug: 16299175
Bug: 17005635

Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
 2014-11-03 09:53:54 -08:00
Narayan Kamath
c936585efd am f2459e2e: am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import." 
* commit 'f2459e2e1688aae285346f2638d49e1b8e230229':
  Add java.util.List import.
 2014-11-03 17:35:39 +00:00
Narayan Kamath
f2459e2e16 am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import." 
* commit '10ac55ba4f0beed608b310c473bb052cbcdf19c1':
  Add java.util.List import.
 2014-11-03 16:52:41 +00:00
Narayan Kamath
9d68b3c839 Remove deprecated DateFormat APIs. 
bug: 18074066
Change-Id: I99cef45105c9f25075c596cf4f52ec5573565596
 2014-11-03 16:01:32 +00:00
Narayan Kamath
10ac55ba4f am 5f8099ed: Merge "Add java.util.List import." 
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
  Add java.util.List import.
 2014-11-03 16:00:57 +00:00
Narayan Kamath
2b4378fef8 Add java.util.List import. 
Unused on master but used downstream.

Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
 2014-11-03 15:55:03 +00:00
Adrian Roos
017c8dc878 am 1814f14c: am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev automerge: fcad9e1 
* commit '1814f14c7d2ddfb0ccf0c8283bc7638059fc9af8':
  Fix colored status bar panning issues
 2014-11-03 15:53:57 +00:00
Adrian Roos
1814f14c7d am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev 
automerge: fcad9e1

* commit 'fcad9e17413da20db95a2cccbfc8641d2f30a4e6':
  Fix colored status bar panning issues
 2014-11-03 15:48:21 +00:00
Adrian Roos
808fe6f99f Merge "Fix colored status bar panning issues" into lmp-mr1-dev 2014-11-03 15:44:08 +00:00
Jason Monk
52eb811a44 am 8efeae7e: am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev automerge: 5c69f5b 
* commit '8efeae7eb4da19bd3dcf1a5013e3011d50f2ca42':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:48:48 +00:00
Narayan Kamath
d449a008a0 am cd4910ef: am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'cd4910ef606e1fa8c974c348174ee55a65541cb6':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:42:49 +00:00
Jason Monk
8efeae7eb4 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
automerge: 5c69f5b

* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:42:18 +00:00
Narayan Kamath
cd4910ef60 am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:38:02 +00:00
Jason Monk
2e647efe01 Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 2014-11-03 14:36:02 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef815.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Narayan Kamath
3455c5c93e am 4a51d064: am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev automerge: 726e9ea 
* commit '4a51d06402ae59b49cf0e99d05a82f71500ffe08':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:57:39 +00:00
Narayan Kamath
4a51d06402 am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 
automerge: 726e9ea

* commit '726e9ea7322d5122a22a0077d58ae92870962df4':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:52:14 +00:00
Narayan Kamath
9301eafbcc Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 2014-11-03 12:45:16 +00:00
Jeff Brown
b3d18f2c2e am 5177979b: am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e automerge: a80162f 
* commit '5177979bbd7459179648057ba00a6399aeb26357':
  Add a function to boost screen brightness temporarily.
 2014-11-01 17:51:16 +00:00
Alex Klyubin
e55c4f43df am a409cdf1: am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f automerge: 42340b9 
* commit 'a409cdf161664666e15f337ea5a0efd078667352':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 17:40:58 +00:00
Jeff Brown
5177979bbd am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e 
automerge: a80162f

* commit 'a80162f0d124e7400e268440c864289a9a7be11e':
  Add a function to boost screen brightness temporarily.
 2014-11-01 15:04:52 +00:00
Alex Klyubin
a409cdf161 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f 
automerge: 42340b9

* commit '42340b9de03fb2b27a0f915d827d729bce7fcda7':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 15:00:10 +00:00
Jeff Brown
0ed053ef53 am e333e674: Add a function to boost screen brightness temporarily. 
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
  Add a function to boost screen brightness temporarily.
 2014-11-01 14:10:46 +00:00
Alex Klyubin
2f1c76f074 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 
* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 14:08:40 +00:00