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

162722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
38e48c2f47 am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '3547c13e0d9188b87c64082cf9756419186fd06e':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:35:40 +00:00
Evan Charlton
4f89e3b215 am 1354a1ff: am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit '1354a1fffec1ece56011f4259fbcecafbf758c74':
  Update the SDK AIDL list
 2014-10-13 22:32:55 +00:00
Evan Charlton
1354a1fffe am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit 'f715da3d6b2c2d5037de69262eba513e863a98d8':
  Update the SDK AIDL list
 2014-10-13 22:28:29 +00:00
Aravind Akella
1f9b32f006 Sensor documentation fixes. 
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
 2014-10-13 22:25:46 +00:00
Evan Charlton
f715da3d6b Merge "Update the SDK AIDL list" into lmp-dev 2014-10-13 22:19:41 +00:00
Evan Charlton
b298a5a594 Update the SDK AIDL list 
Populate the framework.aidl list with .aidl files which are:
  - In the android.* namespace
  - Not marked @hide
  - Do not have their corresponding .java files marked @hide

Bug: 17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
 2014-10-13 15:12:57 -07:00
Sarah Maddox
60c5fbc3a9 am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '64aec659b7b222c8663e36852f75f685c0ab8de4':
  Fixed a typo in Perf Tips.
 2014-10-13 22:08:47 +00:00
Alan Viverette
5bcc5b287b am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit '21ad8732314872cc62ba2d311343c23b1e9078b8':
  Increase contrast for money permission
 2014-10-13 22:08:43 +00:00
Elliott Hughes
b8175ad3bf am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:08:39 +00:00
Jeff Sharkey
1229d266f6 am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit 'c4d774d5d87439180eed0be45eb2242f8bf7cfaa':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:08:35 +00:00
Jesse Hall
8d3cf106aa am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:08:31 +00:00
Amit Mahajan
3547c13e0d am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '097c8d60115a9207ba4140ef99766741a2256361':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:08:28 +00:00
Sarah Maddox
64aec659b7 am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '8601b1b1ca75512177aa3539d33292250b5c9a2d':
  Fixed a typo in Perf Tips.
 2014-10-13 22:04:22 +00:00
Alan Viverette
21ad873231 am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit 'b927dfc774bd9d2c52cf6fbf50fe2eca16994c27':
  Increase contrast for money permission
 2014-10-13 22:04:15 +00:00
Elliott Hughes
c02ddd6a0a am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:04:11 +00:00
Jeff Sharkey
c4d774d5d8 am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:04:06 +00:00
Jesse Hall
d4b38fe5c0 am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:03:59 +00:00
Amit Mahajan
097c8d6011 am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:03:52 +00:00
Sarah Maddox
8601b1b1ca Merge "Fixed a typo in Perf Tips." into lmp-dev 2014-10-13 21:50:30 +00:00
Alan Viverette
b927dfc774 Merge "Increase contrast for money permission" into lmp-dev 2014-10-13 21:31:40 +00:00
Alan Viverette
2776b17327 am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '204e9f4cae2d49348c121c9738f8f33b5cb20b27':
  Always project ripples
 2014-10-13 21:07:55 +00:00
Alan Viverette
204e9f4cae am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '2f82e48abb71c92e41caa8057e3068dbfe96ed62':
  Always project ripples
 2014-10-13 21:03:21 +00:00
Alan Viverette
2f82e48abb Merge "Always project ripples" into lmp-mr1-dev 2014-10-13 20:58:48 +00:00
Elliott Hughes
c130b428c5 Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev 2014-10-13 20:55:30 +00:00
John Spurlock
0e588ea8e1 Make SeekBarVolumizer restartable. 
Decouple start from constructor, making it possible to restart
once stopped.

Bug:17898190
Change-Id: I2f860864161f818d5a62a28331ef1c47051fb39f
 2014-10-13 20:46:36 +00:00
Jeff Sharkey
461b3896ba Merge "DocumentsUI: Add content description for nav." into lmp-dev 2014-10-13 20:31:04 +00:00
Jesse Hall
647e0df0c7 Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 2014-10-13 20:23:15 +00:00
Alan Viverette
dc4e791b29 Increase contrast for money permission 
BUG: 17923303
Change-Id: Ic35a9d37690ec5c4375285ca9b162cbff62db656
 2014-10-13 13:12:49 -07:00
Jeff Sharkey
b7b30f691c DocumentsUI: Add content description for nav. 
Bug: 17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
 2014-10-13 12:55:18 -07:00
Elliott Hughes
9c33f28d91 Ensure that the SIM language doesn't override the user language on the encryption UI. 
Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
 2014-10-13 12:39:56 -07:00
Amit Mahajan
1901e17507 Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 2014-10-13 19:32:36 +00:00
Yohei Yukawa
d6d0c3f54a am 84928e72: am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '84928e72e48f61644f2812a28868c9e6e91fadbe':
  Update config when "Show input method" is changed
 2014-10-13 19:11:45 +00:00
Mike Lockwood
4dd247305f am b3bab92e: am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit 'b3bab92e6b4541e0718aade2396e667b06d98358':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:11:40 +00:00
Michael Wright
d61b3014b3 am 07dee169: am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '07dee169f4efe8f5ab10a39ebf5a41563322cecd':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 19:11:36 +00:00
Geoff Mendal
c98998a903 am fdb3d6d7: (-s ours) am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fdb3d6d7e3e3f310db92f53d5061dcc498a00fc2':
  Import translations. DO NOT MERGE
 2014-10-13 19:11:31 +00:00
Yohei Yukawa
84928e72e4 am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '9ca39d744cdf6ffdb782bbc883b2f4266545f64e':
  Update config when "Show input method" is changed
 2014-10-13 19:06:43 +00:00
Mike Lockwood
b3bab92e6b am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '0a4e2245263c594d85f7579c970c926c50bc1ede':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:06:39 +00:00
Michael Wright
07dee169f4 am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '48ca08a21c162ac3d0bea070b196604ac9283408':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 19:06:34 +00:00
Geoff Mendal
fdb3d6d7e3 am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '06f6b38b76490d574232b526423777d271031730':
  Import translations. DO NOT MERGE
 2014-10-13 19:06:30 +00:00
Geoff Mendal
fd169d1ef6 am 3c68bde1: (-s ours) am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3c68bde1ce64e1d6089f9e4fb89cec402f7f57ca':
  Import translations. DO NOT MERGE
 2014-10-13 19:03:30 +00:00
Yohei Yukawa
9ca39d744c am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '540861c925df9b3743251e5d219cd5fe790f9048':
  Update config when "Show input method" is changed
 2014-10-13 18:57:58 +00:00
Mike Lockwood
0a4e224526 am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '8ca4886e439685fdcb1eff4c3552a62522ebeeb0':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:57:54 +00:00
Michael Wright
48ca08a21c am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '43a7dcc12b212ac4f00af294b13d931dca3c3f8d':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:57:50 +00:00
Geoff Mendal
06f6b38b76 am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ad12f288b1199b636c3961bb86fd11ed2749065e':
  Import translations. DO NOT MERGE
 2014-10-13 18:57:47 +00:00
Geoff Mendal
3c68bde1ce am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ce9003f7c24f44d8e1d1fee65dca444e6a61d061':
  Import translations. DO NOT MERGE
 2014-10-13 18:57:07 +00:00
Geoff Mendal
17d5266ea1 am 6e69aeb9: (-s ours) am d6a85f6e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6e69aeb9b2eb9cbe8fb1006cd2f598f7acd6b6d5':
  Import translations. DO NOT MERGE
 2014-10-13 18:55:26 +00:00
Geoff Mendal
ce9003f7c2 am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '1b77f365d63828e5111a1bec6495a06c07154771':
  Import translations. DO NOT MERGE
 2014-10-13 18:49:14 +00:00
Yohei Yukawa
540861c925 am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
  Update config when "Show input method" is changed
 2014-10-13 18:48:16 +00:00
Mike Lockwood
8ca4886e43 am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '317f9ce85a492a213b8f1dac477b1aefad55f621':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:48:11 +00:00
Michael Wright
43a7dcc12b am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:48:07 +00:00