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

161158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chien-Yu Chen
7e3973c148 CameraManager: add torch mode APIs for flashlight 
Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ifb66c309f23fd7e9f124016e0d9c6b364d19acdd
 2015-03-23 19:40:53 -07:00
Zhijun He
712e5b8ec0 Camera2: add lens facing EXTERNAL enum 
This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
 2015-03-23 19:40:45 -07:00
Zhijun He
de2e4d0130 Camera2: metadata spec update for reprocessing 
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
 2015-03-23 19:40:37 -07:00
Yin-Chia Yeh
b8a93f3fc6 Camera: codegen doc update 
Codegen doc update only.

Change-Id: I444d59effb957e58b14c363174693cd6c7c84ebd
 2015-03-23 19:40:08 -07:00
Yin-Chia Yeh
8611f15c5a Camera2: lens shading related HAL3.3 update 
Codegen doc update.

Change-Id: I0e997b3e6fde7636bef3accdd0f8b7b969d37afa
 2015-03-23 19:40:00 -07:00
Zhijun He
42f617d0cf Camera2: add precapture trigger CANCEL 
Bug: 19265647
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
 2015-03-23 19:39:53 -07:00
Yin-Chia Yeh
63193a717f Camera2: doc update for HAL3.3 tonemapping change 
Codegen doc change.

Change-Id: Idd5185767c177f3179e5833be3f42357a5ead25f
 2015-03-23 19:39:43 -07:00
Pavel Zhamaitsiak
7aa0345fc4 Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev 
automerge: eda354b

* commit 'eda354b7695a873dca210afb0c8516f8f3db164f':
  Wi-Fi Calling: Update strings
 2015-03-23 22:12:04 +00:00
Pavel Zhamaitsiak
eda354b769 Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev 2015-03-23 21:59:36 +00:00
Pavel Zhamaitsiak
35eecf1eb9 Wi-Fi Calling: Update strings 
- Update notification and alert messages for registration errors
- Move WFC mode summary strings from Settings in order to be able
  to share between Dialer and Wireless settings

Change-Id: I12eee26f5e788d2cae5dfe1ce52e2038239fb2f3
 2015-03-23 14:24:38 -07:00
Deepanshu Gupta
58ca246c83 Use right colors for status bar and nav bar. 
Bug: http://b.android.com/81862
Change-Id: Ia10297e83e54c01a50de6cbcac2b7fef48e8d238
 2015-03-22 11:03:44 -07:00
Jeff Brown
d35f8862ac am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
automerge: c19279e

* commit 'c19279ef93628448fbfb142d85ff80a6ad230425':
  Disable more hotkeys while in setup.
 2015-03-20 22:22:31 +00:00
Jeff Brown
c19279ef93 am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.
 2015-03-20 22:12:48 +00:00
Jeff Brown
d62163055f Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 2015-03-20 22:05:07 +00:00
Jeff Brown
38d3feb76c Disable more hotkeys while in setup. 
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
 2015-03-20 13:26:09 -07:00
Paul Jensen
39350847ff Merge "Make NetworkCapabilities.NOT_VPN javadoc visible." into m-wireless-dev 2015-03-20 11:27:18 +00:00
Zach Riggle
4c173f3168 am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
automerge: 630ff31

* commit '630ff318727280fc55eb2ed69019ed43f1802c93':
  Fix NPE in FlashlightController
 2015-03-19 23:40:33 +00:00
Zach Riggle
630ff31872 am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController
 2015-03-19 23:29:18 +00:00
Zach Riggle
901e400826 am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController
 2015-03-19 23:22:10 +00:00
Zach Riggle
a6e7a9b50d am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController
 2015-03-19 23:15:02 +00:00
Zach Riggle
6a5b2110eb Merge "Fix NPE in FlashlightController" into lmp-dev 2015-03-19 23:09:33 +00:00
smain@google.com
f2b28dac5a am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
automerge: fa7c8e3

* commit 'fa7c8e3c805a06062b0c44af51e09b8bb381a810':
  add Places API to the Location feature page
 2015-03-19 22:53:11 +00:00
smain@google.com
fa7c8e3c80 am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page
 2015-03-19 22:41:42 +00:00
smain@google.com
d5fdc28700 am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page
 2015-03-19 22:35:16 +00:00
smain@google.com
3bc84b18b7 am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page
 2015-03-19 22:29:09 +00:00
smain@google.com
910ca41558 am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page
 2015-03-19 22:22:10 +00:00
smain@google.com
4b53dc8bae Merge "add Places API to the Location feature page" into lmp-docs 2015-03-19 22:16:12 +00:00
Joe Fernandez
935ccfc7f3 am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
automerge: 0c8493b

* commit '0c8493baba146c09f482430090d22cd1073288f2':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:54:48 +00:00
Joe Fernandez
416168c426 am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
automerge: 061c8d5

* commit '061c8d576c94950b856eca4b20f4f522f13c53f9':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:54:40 +00:00
Joe Fernandez
4f32e0b49d am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
automerge: 3b2d4cd

* commit '3b2d4cdb2e3fa2ee04589559db5f3fb24d12a29e':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:54:29 +00:00
Eric Gilmore
9f21f86c98 am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
automerge: e91e0be

* commit 'e91e0bec9e36b8d7062fe33ad5bf282916421f8d':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:44:57 +00:00
Joe Fernandez
0c8493baba am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:42:19 +00:00
Joe Fernandez
061c8d576c am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:42:15 +00:00
Joe Fernandez
3b2d4cdb2e am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:42:10 +00:00
Joe Fernandez
bb777ef40d am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:35:09 +00:00
Joe Fernandez
43929db648 am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'f761e4c20ee63873043522990487ecd15bb18966':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:35:05 +00:00
Joe Fernandez
a06c8ff08e am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:34:59 +00:00
Eric Gilmore
e91e0bec9e am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:31:36 +00:00
Joe Fernandez
b88bce219a am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:28:54 +00:00
Joe Fernandez
f761e4c20e am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'd91167e8ceda64809e9afd73ac184dc319a276f5':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:28:45 +00:00
Joe Fernandez
36b2c1609d am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:28:40 +00:00
Eric Gilmore
1f07cfb601 am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:24:57 +00:00
Joe Fernandez
c773358d59 am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:21:47 +00:00
Joe Fernandez
d91167e8ce am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:21:43 +00:00
Joe Fernandez
bacdd2b8de am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:21:37 +00:00
Eric Gilmore
0fdeefbdad am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:17:22 +00:00
Joe Fernandez
dd461b2988 Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 2015-03-19 20:16:32 +00:00
Joe Fernandez
80f947c8b4 Merge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 2015-03-19 20:16:21 +00:00
Joe Fernandez
ef7d80811d Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 2015-03-19 20:16:05 +00:00
Rich Slogar
b35d9508ca am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
automerge: 2e09cf5

* commit '2e09cf5a932c0cf1059979989519be2824abdc87':
  docs: proguard help update
 2015-03-19 20:12:03 +00:00