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

197007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
2da36fb340 am e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs 
* commit 'e9ac81745ef0c5f0d96a2c9dfcf2f84a86ccf85d':
  Docs: Quick typo fix.
 2015-05-28 19:36:56 +00:00
Luan Nguyen
1532af3980 am dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby 
* commit 'dd054f505b42c295baaca375d22c737fcb0fcb92':
  docs: Fix bad heading link for doze-standby
 2015-05-28 19:36:51 +00:00
Peng Xu
0df9a7cfd8 am 2c530e41: am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev 
* commit '2c530e41e0e5ed7b30693a8eff8f14029a27ea45':
  Bug fix and documentation clarification
 2015-05-28 19:29:24 +00:00
Joe Fernandez
61b3adaa4d am f4dcdc02: am e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 
* commit 'f4dcdc022514dce700d2332348544c63edc700cb':
  docs: Fix broken links on M Preview.
 2015-05-28 19:29:19 +00:00
Luan Nguyen
b734284134 am 0fb1421c: am 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references 
* commit '0fb1421c448eea5982280e3ddd84efbcafba81e3':
  docs: Remove api-changes.html and references
 2015-05-28 19:29:13 +00:00
David Friedman
e9ac81745e am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs 
* commit 'dd6ccfd0d97c7a794793cd465be029310efa67ea':
  Docs: Quick typo fix.
 2015-05-28 19:20:19 +00:00
Luan Nguyen
dd054f505b am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby 
* commit '15afeaa99f6da12f6237a2b24fdd544b298bf589':
  docs: Fix bad heading link for doze-standby
 2015-05-28 19:20:13 +00:00
David Friedman
0675e43cf8 am 92e24c4b: am 4ca27389: am 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script. 
* commit '92e24c4b9190d98bf2beb6c5610962a5815b2b84':
  Docs: IO quick fix--commenting out part of script.
 2015-05-28 19:19:33 +00:00
Peng Xu
2c530e41e0 am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev 
* commit '08ecf676e655ba7a86744f63045290d1e331c0f6':
  Bug fix and documentation clarification
 2015-05-28 19:15:31 +00:00
Joe Fernandez
f4dcdc0225 am e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 
* commit 'e0e8570d591cd833f9950c4ac0de8ca425c47f95':
  docs: Fix broken links on M Preview.
 2015-05-28 19:15:26 +00:00
Luan Nguyen
0fb1421c44 am 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references 
* commit '587748cdf78fe0149fef6a0e0ed9099ab804cb1c':
  docs: Remove api-changes.html and references
 2015-05-28 19:15:20 +00:00
David Friedman
92e24c4b91 am 4ca27389: am 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script. 
* commit '4ca273898807c417668b5487e9edbf0b934c7f31':
  Docs: IO quick fix--commenting out part of script.
 2015-05-28 19:11:08 +00:00
Sanket Padawe
694c4bf233 am 041028df: am 07b815ea: am 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev 
* commit '041028df83d7f5d8de20347c06d9fc6bd1d918e6':
  Fix display of "null" string shown in Wifi Settings for AP.
 2015-05-28 19:05:10 +00:00
David Friedman
dd6ccfd0d9 am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs 
* commit '8bf833e40f403f5f40233bf7c68778b2401c5673':
  Docs: Quick typo fix.
 2015-05-28 19:03:28 +00:00
Luan Nguyen
15afeaa99f am 2429cc41: docs: Fix bad heading link for doze-standby 
* commit '2429cc419794a06866670675a5e5b3d7a746dd6b':
  docs: Fix bad heading link for doze-standby
 2015-05-28 19:03:21 +00:00
David Friedman
8bf833e40f Merge "Docs: Quick typo fix." into mnc-preview-docs 2015-05-28 18:59:47 +00:00
Peng Xu
08ecf676e6 Merge "Bug fix and documentation clarification" into mnc-dev 2015-05-28 18:57:46 +00:00
Joe Fernandez
e0e8570d59 am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 
* commit '46e58a17890f9013f2d3714607c4c835df3638e0':
  docs: Fix broken links on M Preview.
 2015-05-28 18:54:43 +00:00
David Friedman
4ca2738988 am 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script. 
* commit '319213eea1438bfa348a4099b5e1d6d8f92d0c4d':
  Docs: IO quick fix--commenting out part of script.
 2015-05-28 18:54:40 +00:00
Luan Nguyen
587748cdf7 am a21ff962: am c5d3758e: docs: Remove api-changes.html and references 
* commit 'a21ff9621e3b9b8d64945ea55165acf435acd9b9':
  docs: Remove api-changes.html and references
 2015-05-28 18:54:39 +00:00
Luan Nguyen
2429cc4197 docs: Fix bad heading link for doze-standby 
bug: 21491909
Change-Id: Id8c10262ab311aca42d3b4d37a479d6543530505
 2015-05-28 11:48:31 -07:00
Sanket Padawe
041028df83 am 07b815ea: am 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev 
* commit '07b815ea1878126557bd07df741c2c7d5fbc4f6a':
  Fix display of "null" string shown in Wifi Settings for AP.
 2015-05-28 18:45:40 +00:00
David Srbecky
efe01cc62e am 3976a569: Merge "Replace --include-cfi with --generate-debug-info." 
* commit '3976a56904e359eb975395725e908122d7d6e466':
  Replace --include-cfi with --generate-debug-info.
 2015-05-28 18:45:36 +00:00
Evgenii Stepanov
b8e100d7a4 am 495ebb11: Merge "Update asan/app_process." 
* commit '495ebb119bd1cea64f985367ba3bb87594e4fa81':
  Update asan/app_process.
 2015-05-28 18:45:30 +00:00
Dianne Hackborn
09d57fe9b3 Add new API to set URI on AssistContent. 
Also rework how we transfer AssistContent and AssistStructure
to the assistant, so they are delivered as completely separate
objects rather than the kludgy bundling them in the assist
data thing.

Change-Id: Ib40cc3b152bafeb358fd3adec564a7dda3a0dd1d
 2015-05-28 11:44:58 -07:00
Amit Mahajan
56548d578c Cleaning up logging in TelephonyManager. 
Bug: 21474174
Change-Id: I4555ada69c233ee9e9d9e45c1d619e8b779d9016
 2015-05-28 11:39:23 -07:00
David Srbecky
3976a56904 Merge "Replace --include-cfi with --generate-debug-info." 2015-05-28 18:37:37 +00:00
Joe Fernandez
46e58a1789 am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 
* commit 'c8bcfe285626da3734281a17bb1748c68a33d46a':
  docs: Fix broken links on M Preview.
 2015-05-28 18:37:07 +00:00
Luan Nguyen
a21ff9621e am c5d3758e: docs: Remove api-changes.html and references 
* commit 'c5d3758eab49974dde9f2c3796e8abed79c69a1c':
  docs: Remove api-changes.html and references
 2015-05-28 18:37:02 +00:00
David Friedman
319213eea1 am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script. 
* commit '52454e38625e7457f645afe97ca3f666d615acc6':
  Docs: IO quick fix--commenting out part of script.
 2015-05-28 18:36:51 +00:00
Yin-Chia Yeh
78329b47a2 am 9d16a7d8: am 9d3df9b7: am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev 
* commit '9d16a7d8bb7415298a0826129baf0ca3f5564b5b':
  Camera2: update legacy metadata
 2015-05-28 18:35:20 +00:00
Evgenii Stepanov
495ebb119b Merge "Update asan/app_process." 2015-05-28 18:31:07 +00:00
Sanket Padawe
07b815ea18 am 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev 
* commit '3a017f2c32eada0af896f8acb30353da05eef8e6':
  Fix display of "null" string shown in Wifi Settings for AP.
 2015-05-28 18:27:19 +00:00
Joe Fernandez
c8bcfe2856 Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 2015-05-28 18:25:59 +00:00
Brian Attwell
f4efdfc51f am 98bc46d1: am 701ea8b5: am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev 
* commit '98bc46d13a523efaf06eae6ddaeb9100d15006a2':
  Deprecate {READ,WRITE}_PROFILE permission
 2015-05-28 18:23:09 +00:00
Luan Nguyen
5fe44c8bc8 am d89cd034: am e886ab11: am 56edce33: am 759b1673: am c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs 
* commit 'd89cd0341cbac80fcccaa5f188fd0459771084e3':
  docs: Remove broken image link from samples.
 2015-05-28 18:23:05 +00:00
Yin-Chia Yeh
9d16a7d8bb am 9d3df9b7: am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev 
* commit '9d3df9b7bacb7ba51d337893a7b5269d69d697d1':
  Camera2: update legacy metadata
 2015-05-28 18:21:44 +00:00
Luan Nguyen
c5d3758eab docs: Remove api-changes.html and references 
bug: 21491968
Change-Id: I4e3c9f135cb568735bbdce999c89699ef13b4cfe
 2015-05-28 11:19:05 -07:00
David Friedman
52454e3862 am bb7877c4: Docs: IO quick fix--commenting out part of script. 
* commit 'bb7877c4fe2c70ece0ab7d596e2a01a0e7c3c0db':
  Docs: IO quick fix--commenting out part of script.
 2015-05-28 18:18:47 +00:00
Sanket Padawe
3a017f2c32 Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev 2015-05-28 18:10:44 +00:00
David Friedman
bb7877c4fe Docs: IO quick fix--commenting out part of script. 
Change-Id: Iaa7aa1d5e055e8ae05c636e1504fa80261f4a78f
 2015-05-28 11:07:41 -07:00
Bryce Lee
b99b91cdf8 Introduce indirection for base micro themes. 
This is needed, since overlays must add/modify items to base themes, but
simply declaring the style in an overlay will override the parent. To
ensure the true parent is never overridden, a base theme is introduced
that both the regular theme and the overlay can inherit from.

Bug: 21425951
Change-Id: I0967d0b4ddf12e9765bc321a7485a6dbdfef0b1e
 2015-05-28 11:03:57 -07:00
Nancy Chen
19f1260a94 am b5f26c14: am af373232: am ec7100d0: Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev 
* commit 'b5f26c141e2df3fa88268ba1f6db5fdb7f5e443f':
  Update docstring for STRING_VVM_TYPE to point to possible values.
 2015-05-28 18:03:32 +00:00
Brian Attwell
98bc46d13a am 701ea8b5: am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev 
* commit '701ea8b5957482c0f6aabdf0d2b3c2f2ab8e5d55':
  Deprecate {READ,WRITE}_PROFILE permission
 2015-05-28 18:03:12 +00:00
Luan Nguyen
d89cd0341c am e886ab11: am 56edce33: am 759b1673: am c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs 
* commit 'e886ab11dc2769ad380a014129685cce1535048e':
  docs: Remove broken image link from samples.
 2015-05-28 18:03:06 +00:00
Yin-Chia Yeh
9d3df9b7ba am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev 
* commit 'f4b998153d4d921a64b7cfdb523cd3a97e2849a9':
  Camera2: update legacy metadata
 2015-05-28 18:01:57 +00:00
Yin-Chia Yeh
f4b998153d Merge "Camera2: update legacy metadata" into mnc-dev 2015-05-28 17:48:17 +00:00
Luan Nguyen
17e46067c0 docs: Fix broken links on M Preview. 
bug:21490711
Change-Id: I1608dae5518f7335b5bc366cc28ee27a73a08521
 2015-05-28 10:47:35 -07:00
Svet Ganov
6f51e48dfb am 6e520470: am 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev 
* commit '6e5204701142b3e1281824ced1ab41813a8c4072':
  Add a normal permission guarding the installer UI - used for stats tracking
 2015-05-28 17:46:09 +00:00
Brian Attwell
701ea8b595 am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev 
* commit '8d38a8d84f3c6ee81db9e6aa38492a7ce7766206':
  Deprecate {READ,WRITE}_PROFILE permission
 2015-05-28 17:43:41 +00:00