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

156835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
f408217411 am 754bffe9: am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit '754bffe9692f2f62c4788b78eedbd63394db15a2':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 02:25:57 +00:00
Robin Lee
bd4f2a473f am de7df08c: am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'de7df08cdad2094ffaaa02c047acd76c05a2f224':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-22 02:25:53 +00:00
Dongwon Kang
94e8b9dc6e am a6372b3b: Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 
* commit 'a6372b3be4d114c2082d83bbd065a0439f9feb2f':
  TIF: add more documentation on Hardware session.
 2014-10-22 02:13:07 +00:00
Leon Scroggins III
754bffe969 am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit 'e463bc388e7f5d83f864b320dde400e390ef5817':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 02:00:46 +00:00
Robin Lee
de7df08cda am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'fc56790085463ab410a5f407a4930b42509ad5f7':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-22 02:00:38 +00:00
Dongwon Kang
a6372b3be4 Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 2014-10-22 01:46:33 +00:00
Alan Viverette
c4a12a7ad0 am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev 
* commit 'bb852b0b6b743aeca3a6daceafc89166ec6022d8':
  Format ListPreference summary with empty string if entry is null
 2014-10-22 00:39:27 +00:00
Alan Viverette
bb852b0b6b Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev 2014-10-22 00:35:29 +00:00
Alan Viverette
13e13ddd4e Format ListPreference summary with empty string if entry is null 
Adding serif-monospace and sans-serif-monospace font families bumped
out the previous monospace, which left the summary as %s. Returning
an unformatted summary is never correct, and we should simply return
a summary populated with an empty string.

BUG: 17666124
Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
 2014-10-21 17:05:07 -07:00
Adam Powell
e055c95b77 am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-dev 
* commit '054e8be5e0f9c83dd9792bb1bc118b1a7fd70e17':
  Intent chooser callback
 2014-10-21 21:44:26 +00:00
Adam Powell
054e8be5e0 Merge "Intent chooser callback" into lmp-mr1-dev 2014-10-21 21:41:19 +00:00
Andrew Lee
ba2f181aa1 am 74af6700: Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev 
* commit '74af6700196ed55a0aa39c7777293e735e7b4d73':
  Add video calling setting to TelephonyManager.
 2014-10-21 21:18:48 +00:00
John Reck
e73a54f33c am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'bf463af2a5ed6c37df5d0e5a49f6a15d457e1c85':
  Surface:lockHardwareCanvas
 2014-10-21 21:12:48 +00:00
Andrew Lee
cd90d42d9d am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev 
* commit '017c6f2daaed2c5f0301587ba88663f73b76ecb1':
  Fire onConferenceChanged after reseting conference.
 2014-10-21 21:12:36 +00:00
Andrew Lee
74af670019 Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev 2014-10-21 21:08:46 +00:00
John Reck
bf463af2a5 Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 2014-10-21 20:59:53 +00:00
Andrew Lee
4a3084a46d Add video calling setting to TelephonyManager. 
We want to add a user setting to enable/disable video calling. This
is a telephony-level setting which the user sets using Telephony's
Call Settings, and applies universally to video calls.

But this setting needs to be accessible in places such as Dialer,
so these changes are to support storing the setting in
TelephonyManager (to be implemented in PhoneInterfaceManager) and
providing access to the setting for applications like Dialer
through TelephonyManager.

+ Add function definitions to ITelephony.
+ Add function wrapper implementations in TelephonyManager.

Bug: 16014284
Change-Id: I1dce8bf5ae4f0ee115698ce9627ba8fc424dd855
 2014-10-21 13:49:42 -07:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
Andrew Lee
017c6f2daa Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev 2014-10-21 20:02:19 +00:00
John Spurlock
0dfda02ec3 am 1a3f7db0: VolumeDialog: Restore default-selection logic. 
* commit '1a3f7db001a75770d888866a760e1308bb1f25fd':
  VolumeDialog: Restore default-selection logic.
 2014-10-21 19:47:00 +00:00
Adam Powell
0b3c11260a Intent chooser callback 
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.

Bug 17363684

Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
 2014-10-21 12:17:50 -07:00
John Spurlock
1a3f7db001 VolumeDialog: Restore default-selection logic. 
Bug: 18066513
Change-Id: Ie72189edf9b59fd8d192d882aaadf1ac05dcb359
 2014-10-21 15:16:16 -04:00
John Spurlock
c6639c26ed am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 
* commit 'cc8b3e8d4e561026cf673c9a234cc151f17b3362':
  Settings: Make SeekBarVolumizer more null-resilient.
 2014-10-21 18:43:06 +00:00
John Spurlock
cc8b3e8d4e Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 2014-10-21 18:39:20 +00:00
Alan Viverette
ed89e45253 am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 
* commit '7c133e19ddabe753a9c0d49d814c89f9df4121ad':
  Fix gradient drawable radius when specified as float, dimension
 2014-10-21 18:33:26 +00:00
Alan Viverette
7c133e19dd Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 2014-10-21 18:25:01 +00:00
John Spurlock
e941116169 am 624dd5ce: Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev 
* commit '624dd5ce9d6dbdf6522d51134128cb9baadd558e':
  Sysui: Include shared prefs in service dump.
 2014-10-21 18:23:30 +00:00
John Spurlock
735f9ebc18 Settings: Make SeekBarVolumizer more null-resilient. 
Now that the instances are reusable, ensure all "post" methods
do a handler check, and ensure they are all internal.

Bug: 18063070
Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
 2014-10-21 14:23:24 -04:00
Alan Viverette
a74b9432e8 am 3d52809b: Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 
* commit '3d52809bad2d96f7f39aa50e51bd53c69607cb4e':
  Prevent excessive accessibility announcements in TimePicker
 2014-10-21 18:18:55 +00:00
Alan Viverette
0a8a3eab8b am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev 
* commit '46b4920ac85c5294174df9421eb9a69b0c9b5d55':
  Propagate state changes even when we don't change drawable index
 2014-10-21 18:18:50 +00:00
John Spurlock
624dd5ce9d Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev 2014-10-21 18:16:47 +00:00
Alan Viverette
3d52809bad Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 2014-10-21 18:16:25 +00:00
Alan Viverette
46b4920ac8 Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev 2014-10-21 18:14:50 +00:00
Alan Viverette
2efbe9816e Fix gradient drawable radius when specified as float, dimension 
BUG: 18070756
Change-Id: I991ff792c376c9695a007f8f1187390ab5ff6e3c
 2014-10-21 11:04:04 -07:00
Andrew Lee
8f8e473cac Fire onConferenceChanged after reseting conference. 
Bug: 17423848
Change-Id: Ic53f40e806f2bfd5b49bff2caad64bb93b290bad
 2014-10-21 10:32:49 -07:00
John Spurlock
7bbb9f6410 Sysui: Include shared prefs in service dump. 
Also:
 - Remove obsolete Prefs helper.
 - Use common file for zen-mode prefs.

Bug: 18062541
Change-Id: I9a6a4733eac0ec1c55da5d359c996cb5fe3bb8af
 2014-10-21 12:26:45 -04:00
Leon Scroggins III
e463bc388e am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit '3c8bde5534d81518f5baf3795989f367373f7dfd':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-21 13:56:42 +00:00
Leon Scroggins III
3c8bde5534 Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 2014-10-21 13:52:30 +00:00
Robin Lee
fc56790085 am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-21 11:58:38 +00:00
Robin Lee
e1c9489cc4 Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 2014-10-21 11:54:52 +00:00
Geoff Mendal
0359259318 am a9a550dd: (-s ours) am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a9a550dd8e87b33979670cf856838ba227500547':
  Import translations. DO NOT MERGE
 2014-10-20 23:51:31 +00:00
Geoff Mendal
a9a550dd8e am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'deddb38462389823c194559052c4d64ee6c3b467':
  Import translations. DO NOT MERGE
 2014-10-20 23:43:33 +00:00
Geoff Mendal
deddb38462 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:39:58 +00:00
Geoff Mendal
e8d005429c Import translations. DO NOT MERGE 
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
 2014-10-20 16:21:14 -07:00
Jinsuk Kim
6ec9b4f09b am 17e9d246: Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev 
* commit '17e9d2468fea360ab17679161f31cf6a38198fc7':
  CEC: Add missing protections for some HdmiControlService API
 2014-10-20 22:56:20 +00:00
Jinsuk Kim
17e9d2468f Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev 2014-10-20 22:50:37 +00:00
Leon Scroggins III
91332e7eca Report that a JavaInputStreamAdaptor is at end. 
This prevents a naive caller from continuing to attempt to read.

BUG:17419670
BUG:17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
 2014-10-20 22:49:35 +00:00
RoboErik
c5109b1ffe am 01c9d330: am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '01c9d330b76e17076a1d71019344c2b859a1eb2c':
  Add missing break to switch statement
 2014-10-20 22:25:49 +00:00
Amit Mahajan
15803d4ace am 1213bf83: Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 
* commit '1213bf83e96bf9a3747a90d84969038b9ad76971':
  Add a constant for invalid profile id value
 2014-10-20 22:21:26 +00:00
RoboErik
01c9d330b7 am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit 'f0a284115a8fb089806eb87db1a20468dd55ecd3':
  Add missing break to switch statement
 2014-10-20 22:19:54 +00:00